From b395aaca53ab880cefe0bc9b1b9649fa47d71487 Mon Sep 17 00:00:00 2001 From: DTILegBG Date: Fri, 8 Dec 2017 08:24:17 -0200 Subject: [PATCH] altera nome classe de pesquisa --- sapl/materia/urls.py | 4 ++-- sapl/norma/forms.py | 6 +++--- sapl/norma/views.py | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sapl/materia/urls.py b/sapl/materia/urls.py index 44051342f..611bdf080 100644 --- a/sapl/materia/urls.py +++ b/sapl/materia/urls.py @@ -25,7 +25,7 @@ from sapl.materia.views import (AcompanhamentoConfirmarView, TramitacaoEmLoteView, UnidadeTramitacaoCrud, proposicao_texto, recuperar_materia) -from sapl.norma.views import NormaPesquisaView +from sapl.norma.views import NormaPesquisaSimplesView from .apps import AppConfig @@ -45,7 +45,7 @@ urlpatterns_impressos = [ FichaSelecionaView.as_view(), name='impressos_ficha_seleciona'), url(r'^materia/impressos/norma-pesquisa/$', - NormaPesquisaView.as_view(), + NormaPesquisaSimplesView.as_view(), name='impressos_norma_pesquisa'), ] diff --git a/sapl/norma/forms.py b/sapl/norma/forms.py index c21650513..e72b41f26 100644 --- a/sapl/norma/forms.py +++ b/sapl/norma/forms.py @@ -209,7 +209,7 @@ class NormaRelacionadaForm(ModelForm): relacionada.save() return relacionada -class NormaPesquisaForm(forms.Form): +class NormaPesquisaSimplesForm(forms.Form): tipo_norma = forms.ModelChoiceField( label=TipoNormaJuridica._meta.verbose_name, queryset=TipoNormaJuridica.objects.all(), @@ -229,7 +229,7 @@ class NormaPesquisaForm(forms.Form): ) def __init__(self, *args, **kwargs): - super(NormaPesquisaForm, self).__init__(*args, **kwargs) + super(NormaPesquisaSimplesForm, self).__init__(*args, **kwargs) row1 = to_row( [('tipo_norma', 6), @@ -246,7 +246,7 @@ class NormaPesquisaForm(forms.Form): ) def clean(self): - super(NormaPesquisaForm, self).clean() + super(NormaPesquisaSimplesForm, self).clean() cleaned_data = self.cleaned_data data_inicial = cleaned_data['data_inicial'] diff --git a/sapl/norma/views.py b/sapl/norma/views.py index 8cf8469d2..8833b0499 100644 --- a/sapl/norma/views.py +++ b/sapl/norma/views.py @@ -20,7 +20,7 @@ from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux, MasterDetailCrud, make_pagination) from sapl.utils import show_results_filter_set -from .forms import NormaFilterSet, NormaJuridicaForm, NormaRelacionadaForm, NormaPesquisaForm +from .forms import NormaFilterSet, NormaJuridicaForm, NormaRelacionadaForm, NormaPesquisaSimplesForm from .models import (AssuntoNorma, NormaJuridica, NormaRelacionada, TipoNormaJuridica, TipoVinculoNormaJuridica) @@ -241,8 +241,8 @@ def gerar_pdf_impressos(request, context, template_name): return response -class NormaPesquisaView(PermissionRequiredMixin, FormView): - form_class = NormaPesquisaForm +class NormaPesquisaSimplesView(PermissionRequiredMixin, FormView): + form_class = NormaPesquisaSimplesForm template_name = 'materia/impressos/norma.html' permission_required = ('materia.can_access_impressos', ) @@ -267,6 +267,7 @@ class NormaPesquisaView(PermissionRequiredMixin, FormView): if context['quantidade'] > 2000: normas = normas[:2000] + context['normas'] = normas