From 5debab804f03c556a9d7f1c0f3ef44b1672e54ea Mon Sep 17 00:00:00 2001 From: LeandroRoberto Date: Thu, 13 Oct 2016 15:07:11 -0300 Subject: [PATCH] Fix #734 --- sapl/comissoes/views.py | 22 +--- sapl/crud/base.py | 109 ++++++++++++++---- .../comissoes/composicao_detail.html | 33 ------ sapl/templates/crud/detail_detail.html | 3 + 4 files changed, 94 insertions(+), 73 deletions(-) delete mode 100644 sapl/templates/comissoes/composicao_detail.html diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py index b0c2551c3..8d3d80e88 100644 --- a/sapl/comissoes/views.py +++ b/sapl/comissoes/views.py @@ -3,7 +3,7 @@ from django.core.urlresolvers import reverse from django.db.models import F from django.views.generic import ListView -from sapl.crud.base import Crud, CrudAux, MasterDetailCrud +from sapl.crud.base import Crud, CrudAux, MasterDetailCrud, RP_DETAIL, RP_LIST from sapl.materia.models import MateriaLegislativa, Tramitacao from .models import (CargoComissao, Comissao, Composicao, Participacao, @@ -27,40 +27,30 @@ TipoComissaoCrud = CrudAux.build( class ParticipacaoCrud(MasterDetailCrud): model = Participacao parent_field = 'composicao__comissao' + public = [RP_DETAIL, ] + ListView = None + is_m2m = True class BaseMixin(MasterDetailCrud.BaseMixin): list_field_names = ['composicao', 'parlamentar', 'cargo'] - class DetailView(MasterDetailCrud.DetailView): - permission_required = [] - class ComposicaoCrud(MasterDetailCrud): model = Composicao parent_field = 'comissao' model_set = 'participacao_set' - - class ListView(MasterDetailCrud.ListView): - permission_required = [] - - class DetailView(MasterDetailCrud.DetailView): - permission_required = [] + public = [RP_LIST, RP_DETAIL, ] class ComissaoCrud(Crud): model = Comissao help_path = 'modulo_comissoes' + public = [RP_LIST, RP_DETAIL, ] class BaseMixin(Crud.BaseMixin): list_field_names = ['nome', 'sigla', 'tipo', 'data_criacao', 'ativa'] ordering = '-ativa', 'sigla' - class ListView(Crud.ListView): - permission_required = [] - - class DetailView(Crud.DetailView): - permission_required = [] - class MateriasTramitacaoListView(ListView): template_name = "comissoes/materias_em_tramitacao.html" diff --git a/sapl/crud/base.py b/sapl/crud/base.py index c7ec4d640..a870e697f 100644 --- a/sapl/crud/base.py +++ b/sapl/crud/base.py @@ -94,6 +94,7 @@ variáveis do crud: ordered_list = False desativa os clicks e controles de ord da listagem parent_field = parentesco reverso separado por '__' namespace + return_parent_field_url """ @@ -978,20 +979,23 @@ class MasterDetailCrud(Crud): parent_object = getattr(parent_object, field) else: parent_object = getattr(self.object, obj.parent_field) + if not isinstance(parent_object, models.Model): if parent_object.count() > 1: if 'pkk' not in self.request.GET: - raise Http404 + raise Http404() root_pk = self.request.GET['pkk'] parent_object = parent_object.filter(id=root_pk) parent_object = parent_object.first() if not parent_object: - raise Http404 + raise Http404() + root_pk = parent_object.pk else: - root_pk = self.kwargs['pk'] # in list and create + root_pk = self.kwargs['pk'] if 'pkk' not in self.request.GET\ + else self.request.GET['pkk'] kwargs.setdefault('root_pk', root_pk) context = super(CrudBaseMixin, self).get_context_data(**kwargs) @@ -1066,11 +1070,11 @@ class MasterDetailCrud(Crud): obj = self.crud if hasattr(self, 'crud') else self form = super(MasterDetailCrud.CreateView, self).get_form( self.form_class) - if not obj.is_m2m: - parent_field = obj.parent_field.split('__')[0] - field = self.model._meta.get_field(parent_field) + parent_field = obj.parent_field.split('__') + if not obj.is_m2m or len(parent_field) > 1: + field = self.model._meta.get_field(parent_field[0]) parent = field.related_model.objects.get(pk=self.kwargs['pk']) - setattr(form.instance, parent_field, parent) + setattr(form.instance, parent_field[0], parent) return form def get_context_data(self, **kwargs): @@ -1118,8 +1122,14 @@ class MasterDetailCrud(Crud): def get_success_url(self): obj = self.crud if hasattr(self, 'crud') else self - parent_object = getattr( - self.get_object(), obj.parent_field) + if '__' in obj.parent_field: + fields = obj.parent_field.split('__') + parent_object = self.object + for field in fields: + parent_object = getattr(parent_object, field) + break + else: + parent_object = getattr(self.object, obj.parent_field) if not isinstance(parent_object, models.Model): if parent_object.count() > 1: if 'pkk' not in self.request.GET: @@ -1134,7 +1144,12 @@ class MasterDetailCrud(Crud): root_pk = parent_object.pk pk = root_pk - return self.resolve_url(ACTION_LIST, args=(pk,)) + + namespace = parent_object._meta.app_config.name + return reverse('%s:%s' % ( + namespace, + '%s_%s' % (parent_object._meta.model_name, ACTION_DETAIL)), + args=(pk,)) class DetailView(Crud.DetailView): permission_required = RP_DETAIL, @@ -1147,6 +1162,10 @@ class MasterDetailCrud(Crud): @property def detail_list_url(self): obj = self.crud if hasattr(self, 'crud') else self + + if not obj.ListView: + return '' + if not obj.ListView.permission_required or\ self.request.user.has_perm(self.permission(RP_LIST)): if '__' in obj.parent_field: @@ -1197,8 +1216,20 @@ class MasterDetailCrud(Crud): if not parent_object: raise Http404 root_pk = parent_object.pk - pk = root_pk - return self.resolve_url(ACTION_CREATE, args=(pk,)) + + url = self.resolve_url(ACTION_CREATE, args=(root_pk,)) + if not obj.is_m2m: + return url + else: + if '__' in obj.parent_field: + fields = obj.parent_field.split('__') + parent_object = self.object + for field in fields: + parent_object = getattr(parent_object, field) + else: + parent_object = getattr(self.object, obj.parent_field) + + return url + '?pkk=' + str(parent_object.pk) else: return '' @@ -1208,29 +1239,59 @@ class MasterDetailCrud(Crud): if hasattr(obj, 'model_set') and obj.model_set\ and self.request.user.has_perm( self.permission_set(RP_ADD)): - root_pk = self.object .pk + root_pk = self.object.pk pk = root_pk - return self.resolve_url_set(ACTION_CREATE, args=(pk,)) + + url = self.resolve_url_set(ACTION_CREATE, args=(pk,)) + if not obj.is_m2m: + return url + else: + if '__' in obj.parent_field: + fields = obj.parent_field.split('__') + parent_object = self.object + for field in fields: + parent_object = getattr(parent_object, field) + else: + parent_object = getattr(self.object, obj.parent_field) + + return url + '?pkk=' + str(parent_object.pk) + else: return '' @property def detail_root_detail_url(self): - """ - Implementar retorno para o parent_field imediato no caso de - edição em cascata de MasterDetailDetail... - """ + obj = self.crud if hasattr(self, 'crud') else self + if hasattr(obj, 'parent_field'): + parent_field = obj.parent_field.split('__') + if not obj.is_m2m or len(parent_field) > 1: + field = self.model._meta.get_field(parent_field[0]) + + if isinstance(getattr( + self.object, parent_field[0]), models.Model): + parent_object = getattr(self.object, parent_field[0]) + + root_pk = parent_object.pk + pk = root_pk + + namespace = parent_object._meta.app_config.name + return reverse('%s:%s' % ( + namespace, + '%s_%s' % (parent_object._meta.model_name, + ACTION_DETAIL)), + args=(pk,)) return '' + @property + def detail_root_detail_verbose_name(self): obj = self.crud if hasattr(self, 'crud') else self if hasattr(obj, 'parent_field'): - # parent_field = obj.parent_field.split('__')[0] + parent_field = obj.parent_field.split('__') + if not obj.is_m2m or len(parent_field) > 1: + field = self.model._meta.get_field(parent_field[0]) - root_pk = self.object .pk - pk = root_pk - return self.resolve_url(ACTION_DELETE, args=(pk,)) - else: - return '' + return field.verbose_name + return '' @classonlymethod def build(cls, model, parent_field, help_path, diff --git a/sapl/templates/comissoes/composicao_detail.html b/sapl/templates/comissoes/composicao_detail.html deleted file mode 100644 index f47aa9c99..000000000 --- a/sapl/templates/comissoes/composicao_detail.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "crud/detail.html" %} -{% load i18n %} -{% load crispy_forms_tags %} -{% block detail_content %} - - - - - - - - - - - - - {% for participacao in participacoes %} - - - - - - - - - - {% endfor %} -
NomeCargoTitularDesignaçãoDesligamentoMotivoObservação
{{participacao.parlamentar.nome_parlamentar}}{{participacao.cargo}}{{participacao.titular|yesno:"Sim,Não"}}{{participacao.data_designacao|date:"d/m/Y"}}{{participacao.data_desligamento|date:"d/m/Y"|default:"-"}}{{participacao.motivo_desligamento|default:"-"}}{{participacao.observacao|default:"-"}}
- - {% if user.is_authenticated %} - Incluir Parlamentar - {% endif %} -{% endblock detail_content %} diff --git a/sapl/templates/crud/detail_detail.html b/sapl/templates/crud/detail_detail.html index c72be069a..9f5472e97 100644 --- a/sapl/templates/crud/detail_detail.html +++ b/sapl/templates/crud/detail_detail.html @@ -6,6 +6,9 @@
{% block actions %}
+ {% if view.detail_root_detail_url %} + {% trans 'Retornar para' %} {{view.detail_root_detail_verbose_name}} + {% endif %} {% if view.detail_list_url %} {% trans 'Listar' %} {{view.verbose_name_plural}} {% endif %}