From fff3d1e78b0e2661365498814b7d74e6e8936417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Tue, 9 Jun 2020 16:19:03 -0300 Subject: [PATCH] Aplica subnav nas telas --- sapl/sessao/urls.py | 14 +++++++------- sapl/sessao/views.py | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sapl/sessao/urls.py b/sapl/sessao/urls.py index 529feb86a..8621f04ba 100644 --- a/sapl/sessao/urls.py +++ b/sapl/sessao/urls.py @@ -106,12 +106,6 @@ urlpatterns = [ url(r'^sessao/(?P\d+)/adicionar-varias-materias-ordem-dia/', AdicionarVariasMateriasOrdemDia.as_view(), name='adicionar_varias_materias_ordem_dia'), - url(r'^sessao/(?P\d+)/transf-mat-exp/', - TransferenciaMateriasExpediente.as_view(), - name="transf_mat_exp"), - url(r'^sessao/(?P\d+)/transf-mat-ordemdia/', - TransferenciaMateriasOrdemDia.as_view(), - name="transf_mat_ordemdia"), # PAUTA SESSÃO url(r'^sessao/pauta-sessao$', @@ -198,5 +192,11 @@ urlpatterns = [ url(r'^sessao/(?P\d+)/(?P\d+)/(?P\d+)/retirar-leitura$', retirar_leitura, name='retirar_leitura'), - + + url(r'^sessao/(?P\d+)/transf-mat-exp$', + TransferenciaMateriasExpediente.as_view(), + name="transf_mat_exp"), + url(r'^sessao/(?P\d+)/transf-mat-ordemdia$', + TransferenciaMateriasOrdemDia.as_view(), + name="transf_mat_ordemdia"), ] diff --git a/sapl/sessao/views.py b/sapl/sessao/views.py index eece58f9b..6544ba377 100755 --- a/sapl/sessao/views.py +++ b/sapl/sessao/views.py @@ -572,6 +572,8 @@ class TransferenciaMateriasSessaoAbstract(PermissionRequiredMixin, ListView): data_inicio__gte=sessao_plenaria_atual.data_inicio ).exclude(pk=sessao_plenaria_atual.pk).order_by("-data_inicio") + context['subnav_template_name'] = 'sessao/subnav.yaml' + context['root_pk'] = self.kwargs['pk'] return context def post(self, request, *args, **kwargs):