From 803ffe29d81ce78577deaba9d6c7242a3848d34c Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Fri, 5 Apr 2019 12:05:01 -0300 Subject: [PATCH] Adiciona checagem de erro --- sapl/base/views.py | 27 +++++++++++++++++++++------ sapl/materia/views.py | 4 ++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/sapl/base/views.py b/sapl/base/views.py index 76683e6bd..6071ba86b 100644 --- a/sapl/base/views.py +++ b/sapl/base/views.py @@ -1751,17 +1751,32 @@ class LogotipoView(RedirectView): def pesquisa_textual(request): + if 'q' not in request.GET: + return JsonResponse({'total': 0, + 'resultados': []}) + results = SearchQuerySet().filter(content=request.GET['q']) - json_dict = {} - json_dict['total'] = results.count() - json_dict['parametros'] = request.GET['q'] - json_dict['resultados'] = [] + json_dict = { + 'total': results.count(), + 'parametros': request.GET['q'], + 'resultados': [], + } for e in results: + sec_dict = {} - sec_dict['objeto'] = str(e.object) #remover_acentos() para usar sem parser de json - sec_dict['pk'] = e.object.pk + try: + sec_dict['pk'] = e.object.pk + 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 + 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)) + json_dict['resultados'].append(sec_dict) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index afde0ef64..500a34333 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1156,6 +1156,10 @@ class RelatoriaCrud(MasterDetailCrud): 'composicao': composicao} +def filtro_campos(object, lista): + + + class TramitacaoCrud(MasterDetailCrud): model = Tramitacao parent_field = 'materia'