Browse Source

altera nome classe de pesquisa

pull/1633/head
DTILegBG 8 years ago
parent
commit
b395aaca53
  1. 4
      sapl/materia/urls.py
  2. 6
      sapl/norma/forms.py
  3. 7
      sapl/norma/views.py

4
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'),
]

6
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']

7
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

Loading…
Cancel
Save