From 457c0203c82c4016dea82eb312f9cdfdea207829 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 5 Sep 2018 16:12:59 -0300 Subject: [PATCH] =?UTF-8?q?HOT-FIX:=20adiciona=20'indexa=C3=A7=C3=A3o'=20a?= =?UTF-8?q?=20Norma=20e=20corrige=20acentua=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/materia/forms.py | 3 ++- sapl/norma/forms.py | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 97e0ef9b4..c353b862f 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -676,7 +676,8 @@ class MateriaLegislativaFilterSet(django_filters.FilterSet): widget=forms.HiddenInput()) ementa = django_filters.CharFilter(lookup_expr='icontains') - indexacao = django_filters.CharFilter(lookup_expr='icontains') + indexacao = django_filters.CharFilter(lookup_expr='icontains', + label=_('Indexação')) em_tramitacao = django_filters.ChoiceFilter(required=False, label='Em tramitação', diff --git a/sapl/norma/forms.py b/sapl/norma/forms.py index 9970400c3..afcc052cd 100644 --- a/sapl/norma/forms.py +++ b/sapl/norma/forms.py @@ -52,6 +52,9 @@ class NormaFilterSet(django_filters.FilterSet): ementa = django_filters.CharFilter(lookup_expr='icontains') + indexacao = django_filters.CharFilter(lookup_expr='icontains', + label=_('Indexação')) + assuntos = django_filters.ModelChoiceFilter( queryset=AssuntoNorma.objects.all()) @@ -67,13 +70,14 @@ class NormaFilterSet(django_filters.FilterSet): row1 = to_row([('tipo', 4), ('numero', 4), ('ano', 4)]) row2 = to_row([('data', 6), ('data_publicacao', 6)]) - row3 = to_row([('ementa', 6), ('assuntos', 6), ('o',6)]) + row3 = to_row([('ementa', 6), ('assuntos', 6)]) + row4 = to_row([('o',6), ('indexacao', 6)]) self.form.helper = FormHelper() self.form.helper.form_method = 'GET' self.form.helper.layout = Layout( Fieldset(_('Pesquisa de Norma'), - row1, row2, row3, + row1, row2, row3, row4, form_actions(label='Pesquisar')) )