Browse Source

correções

pull/2309/head
AndreSouto 7 years ago
parent
commit
7baabebce2
  1. 38
      sapl/crud/base.py
  2. 2
      sapl/sessao/views.py
  3. 1
      sapl/settings.py

38
sapl/crud/base.py

@ -118,7 +118,8 @@ class SearchMixin(models.Model):
try: try:
search += str(getattr(self, str_field)) + ' ' search += str(getattr(self, str_field)) + ' '
except Exception as e: except Exception as e:
self.logger.error(str(e)) username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
pass pass
else: else:
_self = self _self = self
@ -556,7 +557,8 @@ class CrudListView(PermissionRequiredContainerCrudMixin, ListView):
try: try:
fm = model._meta.get_field(fo) fm = model._meta.get_field(fo)
except Exception as e: except Exception as e:
self.logger.error(str(e)) username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
pass pass
if fm and hasattr(fm, 'related_model')\ if fm and hasattr(fm, 'related_model')\
@ -627,7 +629,8 @@ class CrudCreateView(PermissionRequiredContainerCrudMixin,
self.object.owner = self.request.user self.object.owner = self.request.user
self.object.modifier = self.request.user self.object.modifier = self.request.user
except Exception as e: except Exception as e:
self.logger.error(str(e)) username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
pass pass
if self.container_field: if self.container_field:
@ -698,7 +701,8 @@ class CrudDetailView(PermissionRequiredContainerCrudMixin,
fieldname).related_model._meta.verbose_name_plural) fieldname).related_model._meta.verbose_name_plural)
for fieldname in self.list_field_names_set] for fieldname in self.list_field_names_set]
except Exception as e: except Exception as e:
self.logger.error(tr(e)) username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
obj = self.crud if hasattr(self, 'crud') else self obj = self.crud if hasattr(self, 'crud') else self
return [getattr( return [getattr(
self.object, self.object,
@ -726,7 +730,8 @@ class CrudDetailView(PermissionRequiredContainerCrudMixin,
if i == 0 else None) if i == 0 else None)
for i, name in enumerate(self.list_field_names_set)] for i, name in enumerate(self.list_field_names_set)]
except Exception as e: except Exception as e:
self.logger.error(str(e)) username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
return [( return [(
getattr(obj, name), getattr(obj, name),
self.resolve_model_set_url(ACTION_DETAIL, args=(obj.id,)) self.resolve_model_set_url(ACTION_DETAIL, args=(obj.id,))
@ -742,7 +747,8 @@ class CrudDetailView(PermissionRequiredContainerCrudMixin,
try: try:
self.object = self.model.objects.get(pk=kwargs.get('pk')) self.object = self.model.objects.get(pk=kwargs.get('pk'))
except Exception as e: except Exception as e:
self.logger.error(str(e)) username = request.user.username
self.logger.error("user=" + username + ". " + str(e))
raise Http404 raise Http404
obj = self.crud if hasattr(self, 'crud') else self obj = self.crud if hasattr(self, 'crud') else self
if hasattr(obj, 'model_set') and obj.model_set: if hasattr(obj, 'model_set') and obj.model_set:
@ -823,7 +829,8 @@ class CrudUpdateView(PermissionRequiredContainerCrudMixin,
try: try:
self.object.modifier = self.request.user self.object.modifier = self.request.user
except Exception as e: except Exception as e:
self.logger.error(str(e)) username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
pass pass
return super().form_valid(form) return super().form_valid(form)
@ -867,13 +874,20 @@ class CrudDeleteView(PermissionRequiredContainerCrudMixin,
error_msg = 'Registro não pode ser removido, pois\ error_msg = 'Registro não pode ser removido, pois\
é referenciado por outros registros:<br>\ é referenciado por outros registros:<br>\
<ul>' <ul>'
error_msg2 = ''
for i in err.protected_objects: for i in err.protected_objects:
error_msg += '<li>{} - {}</li>'.format( error_msg += '<li>{} - {}</li>'.format(
i._meta.verbose_name, i i._meta.verbose_name, i
) )
error_msg2 += '{} - {}, '.format(
i._meta.verbose_name, i
)
error_msg2 = error_msg2[:len(error_msg2)-2] + '.'
error_msg += '</ul>' error_msg += '</ul>'
self.logger.error("Registro não pode ser removido, pois "
"é referenciado por outros registros") username = request.user.username
self.logger.error("user=" + username + ". Registro não pode ser removido, pois "
"é referenciado por outros registros: " + error_msg2)
messages.add_message(request, messages.add_message(request,
messages.ERROR, messages.ERROR,
error_msg) error_msg)
@ -1116,7 +1130,8 @@ class MasterDetailCrud(Crud):
try: try:
parent_object = parent_model.objects.get(**params) parent_object = parent_model.objects.get(**params)
except Exception as e: except Exception as e:
self.logger.error(str(e)) username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
raise Http404() raise Http404()
context[ context[
@ -1182,7 +1197,8 @@ class MasterDetailCrud(Crud):
try: try:
parent_object = parent_model.objects.get(**params) parent_object = parent_model.objects.get(**params)
except Exception as e: except Exception as e:
self.logger.error(str(e)) username = self.request.user.username
self.logger.error("user=" + username + ". " + str(e))
raise Http404() raise Http404()
else: else:
parent_model = self.model parent_model = self.model

2
sapl/sessao/views.py

@ -1582,7 +1582,7 @@ class ExpedienteView(FormMixin, DetailView):
msg = _('Registro salvo com sucesso') msg = _('Registro salvo com sucesso')
messages.add_message(self.request, messages.SUCCESS, msg) messages.add_message(self.request, messages.SUCCESS, msg)
self.logger.info('user=' + username + '. ExpedienteSessao(sessao_plenaria_id={} e tipo_id{}) salvo com sucesso.' self.logger.info('user=' + username + '. ExpedienteSessao(sessao_plenaria_id={} e tipo_id={}) salvo com sucesso.'
.format(self.object.id, tipo)) .format(self.object.id, tipo))
return self.form_valid(form) return self.form_valid(form)

1
sapl/settings.py

@ -14,6 +14,7 @@ See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
""" """
import socket import socket
import logging
from decouple import config from decouple import config
from dj_database_url import parse as db_url from dj_database_url import parse as db_url

Loading…
Cancel
Save