From 58b9285ab7c15e14c3bce95f7d688733a9ade930 Mon Sep 17 00:00:00 2001 From: Mariana Mendes Date: Tue, 2 Oct 2018 09:55:51 -0300 Subject: [PATCH] Fix the reverse url --- sapl/sessao/urls.py | 3 +-- sapl/sessao/views.py | 18 ++++++++---------- sapl/templates/sessao/layouts.yaml | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/sapl/sessao/urls.py b/sapl/sessao/urls.py index ed68cfbe0..40b8696fa 100644 --- a/sapl/sessao/urls.py +++ b/sapl/sessao/urls.py @@ -38,6 +38,7 @@ urlpatterns = [ url(r'^sessao/', include(SessaoCrud.get_urls() + OradorCrud.get_urls() + OradorExpedienteCrud.get_urls() + ExpedienteMateriaCrud.get_urls() + + JustificativaAusenciaCrud.get_urls() + MateriaOrdemDiaCrud.get_urls())), url(r'^sessao/(?P\d+)/mesa$', MesaView.as_view(), name='mesa'), @@ -155,6 +156,4 @@ urlpatterns = [ url(r'^sessao/mudar-ordem-materia-sessao/', mudar_ordem_materia_sessao, name='mudar_ordem_materia_sessao'), - url(r'^sessao/justificativa/', - include(JustificativaAusenciaCrud.get_urls())), ] diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index d9545f8bd..ce94b34fd 100644 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -2900,9 +2900,10 @@ def mudar_ordem_materia_sessao(request): return -class JustificativaAusenciaCrud(Crud): +class JustificativaAusenciaCrud(MasterDetailCrud): model = JustificativaAusencia public = [RP_LIST, RP_DETAIL, ] + parent_field = 'sessao_plenaria' def get(self, request, *args, **kwargs): self.object = self.get_object() @@ -2917,15 +2918,15 @@ class JustificativaAusenciaCrud(Crud): context.update({'presenca_sessao': parlamentares_sessao}) return self.render_to_response(context) - class BaseMixin(Crud.BaseMixin): + class BaseMixin(MasterDetailCrud.BaseMixin): list_field_names = ['sessao_plenaria', 'tipo_ausencia', 'hora', 'data'] ordering = 'sessao_plenaria', 'tipo_ausencia', 'data' - class ListView(Crud.ListView): + class ListView(MasterDetailCrud.ListView): paginate_by = 10 - class CreateView(Crud.CreateView): + class CreateView(MasterDetailCrud.CreateView): form_class = JustificativaAusenciaForm def get_initial(self): @@ -2933,16 +2934,13 @@ class JustificativaAusenciaCrud(Crud): not self.sessao_plenaria.finalizada: raise ValidationError(_('A Sessão deve estar finalizada para registrar as ausências')) else: - return {} - - def form_valid(self, form): - return super(Crud.CreateView, self).form_valid(form) + return {'sessao_plenaria': self.sessao_plenaria} def get_success_url(self): return reverse('sapl.sessao:justificativaausencia_list', kwargs={'pk': self.kwargs['pk']}) - class UpdateView(Crud.UpdateView): + class UpdateView(MasterDetailCrud.UpdateView): form_class = JustificativaAusenciaForm def get_initial(self): @@ -2952,6 +2950,6 @@ class JustificativaAusenciaCrud(Crud): else: return {'sessao_plenaria': self.sessao_plenaria} - class DeleteView(Crud.DeleteView): + class DeleteView(MasterDetailCrud.DeleteView): pass diff --git a/sapl/templates/sessao/layouts.yaml b/sapl/templates/sessao/layouts.yaml index f9934deae..9b5ea9045 100644 --- a/sapl/templates/sessao/layouts.yaml +++ b/sapl/templates/sessao/layouts.yaml @@ -91,7 +91,7 @@ TipoJustificativa: JustificativaAusenica: {% trans 'Justificativa de Ausência' %}: - - sessao parlamentar + - sessao_plenaria parlamentar - data hora - tipo_ausencia - ausencia