From 524451f40435174ae14b839f1e0eee4a39752285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o?= Date: Fri, 5 Apr 2019 16:43:13 -0300 Subject: [PATCH] Atualizar --- sapl/api/views.py | 11 +++++------ sapl/protocoloadm/views.py | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sapl/api/views.py b/sapl/api/views.py index 71794806d..13045d6bb 100644 --- a/sapl/api/views.py +++ b/sapl/api/views.py @@ -26,7 +26,7 @@ from sapl.materia.models import Proposicao, TipoMateriaLegislativa,\ MateriaLegislativa, Tramitacao from sapl.parlamentares.models import Parlamentar from sapl.protocoloadm.models import DocumentoAdministrativo,\ - DocumentoAcessorioAdministrativo, TramitacaoAdministrativo + DocumentoAcessorioAdministrativo, TramitacaoAdministrativo, Anexado from sapl.sessao.models import SessaoPlenaria, ExpedienteSessao from sapl.utils import models_with_gr_for_model, choice_anos_com_sessaoplenaria @@ -489,9 +489,8 @@ class _TramitacaoAdministrativoViewSet(BusinessRulesNotImplementedMixin): return qs -class _AnexadoViewSet( - SaplSetViews['protocoloadm']['anexado'], - BusinessRulesNotImplementedMixin): +@customize(Anexado) +class _AnexadoViewSet(BusinessRulesNotImplementedMixin): permission_classes = ( _DocumentoAdministrativoViewSet.DocumentoAdministrativoPermission, ) @@ -504,8 +503,8 @@ class _AnexadoViewSet( return qs -class _SessaoPlenariaViewSet( - SaplSetViews['sessao']['sessaoplenaria']): +@customize(SessaoPlenaria) +class _SessaoPlenariaViewSet: @action(detail=False) def years(self, request, *args, **kwargs): diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py index eec5300d4..0c2e13157 100755 --- a/sapl/protocoloadm/views.py +++ b/sapl/protocoloadm/views.py @@ -1020,7 +1020,7 @@ class DocumentoAnexadoEmLoteView(PermissionRequiredMixin, FilterView): ciclico = False anexados_anexado = Anexado.objects.filter(documento_principal=documento_anexado) - while(anexados_anexado and not ciclico): + while anexados_anexado and not ciclico: anexados = [] for anexo in anexados_anexado: