From e8a5fce11c8aed209b51cadb22d679d8d19ea02e Mon Sep 17 00:00:00 2001 From: Victor Fabre Date: Wed, 10 Apr 2019 18:55:52 -0300 Subject: [PATCH] =?UTF-8?q?Cria=20fun=C3=A7=C3=A3o=20filtra=20campos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/base/views.py | 27 ++++++++++++++++++++++++--- sapl/materia/views.py | 4 ---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/sapl/base/views.py b/sapl/base/views.py index 6071ba86b..b01510883 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -1749,6 +1749,28 @@ class LogotipoView(RedirectView): logo = casa and casa.logotipo and casa.logotipo.name return os.path.join(settings.MEDIA_URL, logo) if logo else STATIC_LOGO +def filtro_campos(dicionario): + + chaves_desejadas = ['ementa', + 'ano', + 'numero', + 'em_tramitacao', + 'data_apresentacao', + 'apelido', + 'indexacao', + 'data_publicacao', + 'data', + 'data_vigencia'] + del_list = [] + for key in dicionario.keys(): + if key not in chaves_desejadas: + del_list = del_list + [key] + + for key in del_list: + del dicionario[key] + + return dicionario + def pesquisa_textual(request): if 'q' not in request.GET: @@ -1770,10 +1792,9 @@ def pesquisa_textual(request): except: # Index and db are out of sync. Object has been deleted from database continue - sec_dict['objeto'] = str(e.object.__dict__) # remover_acentos() para usar sem parser de json + dici = filtro_campos(e.object.__dict__) + sec_dict['objeto'] = str(dici) sec_dict['text'] = str(e.object.ementa) - sec_dict['ano'] = str(e.object.ano) - sec_dict['numero'] = str(e.object.numero) sec_dict['model'] = str(type(e.object)) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 500a34333..afde0ef64 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1156,10 +1156,6 @@ class RelatoriaCrud(MasterDetailCrud): 'composicao': composicao} -def filtro_campos(object, lista): - - - class TramitacaoCrud(MasterDetailCrud): model = Tramitacao parent_field = 'materia'