From cef296f4e929fb2dc51574a91bf33119d8552438 Mon Sep 17 00:00:00 2001
From: Leandro Roberto <leandroroberto.br@gmail.com>
Date: Sun, 26 Aug 2018 23:24:44 -0300
Subject: [PATCH] =?UTF-8?q?add=20pesquisa=20a=20lista=20de=20Express=C3=B5?=
 =?UTF-8?q?es=20Textuais?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl/base/views.py        | 4 +++-
 sapl/crud/base.py         | 6 ++++--
 sapl/templates/index.html | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sapl/base/views.py b/sapl/base/views.py
index 286fb6809..9d825a483 100644
--- a/sapl/base/views.py
+++ b/sapl/base/views.py
@@ -23,7 +23,7 @@ from haystack.views import SearchView
 from sapl import settings
 from sapl.base.forms import AutorForm, AutorFormForAdmin, TipoAutorForm
 from sapl.base.models import Autor, TipoAutor, ExpressaoTextual
-from sapl.crud.base import CrudAux, make_pagination, Crud
+from sapl.crud.base import CrudAux, make_pagination, Crud, ListWithSearchForm
 from sapl.materia.models import (Autoria, MateriaLegislativa,
                                  TipoMateriaLegislativa)
 from sapl.rules.apps import AppConfig as RulesAppConfig
@@ -86,6 +86,8 @@ class ExpressaoTextualCrud(Crud):
 
     class ListView(Crud.ListView):
         paginate_by = 30
+        form_search_class = ListWithSearchForm
+        lookup_search = 'value__icontains'
 
 
 class TipoAutorCrud(CrudAux):
diff --git a/sapl/crud/base.py b/sapl/crud/base.py
index edf8b3e84..e8a1a658a 100644
--- a/sapl/crud/base.py
+++ b/sapl/crud/base.py
@@ -17,7 +17,6 @@ from django.http.response import Http404
 from django.shortcuts import redirect
 from django.utils.decorators import classonlymethod
 from django.utils.encoding import force_text
-from sapl.translation import ugettext_lazy as _
 from django.utils.translation import string_concat
 from django.views.generic import (CreateView, DeleteView, DetailView, ListView,
                                   UpdateView)
@@ -28,8 +27,10 @@ from sapl.crispy_layout_mixin import CrispyLayoutFormMixin, get_field_display
 from sapl.rules.map_rules import (RP_ADD, RP_CHANGE, RP_DELETE, RP_DETAIL,
                                   RP_LIST)
 from sapl.settings import BASE_DIR
+from sapl.translation import ugettext_lazy as _
 from sapl.utils import normalize
 
+
 logger = logging.getLogger(BASE_DIR.name)
 
 ACTION_LIST, ACTION_CREATE, ACTION_DETAIL, ACTION_UPDATE, ACTION_DELETE = \
@@ -382,6 +383,7 @@ class CrudBaseMixin(CrispyLayoutFormMixin):
 
 class CrudListView(PermissionRequiredContainerCrudMixin, ListView):
     permission_required = (RP_LIST, )
+    lookup_search = 'search__icontains'
 
     @classmethod
     def get_url_regex(cls):
@@ -520,7 +522,7 @@ class CrudListView(PermissionRequiredContainerCrudMixin, ListView):
                     for item in query:
                         if not item:
                             continue
-                        q = q & models.Q(search__icontains=item)
+                        q = q & models.Q(**{self.lookup_search: item})
 
                     if q:
                         queryset = queryset.filter(q)
diff --git a/sapl/templates/index.html b/sapl/templates/index.html
index b8ee3cff7..04730c152 100644
--- a/sapl/templates/index.html
+++ b/sapl/templates/index.html
@@ -126,7 +126,7 @@
             <div class="homeIcon">
                 <img src="{% static 'img/icon_normas_juridicas.png' %}" alt="Normas Jurídicas">
             </div>
-            <h2>Normas Jurídicas</h2>
+            <h2>{% trans 'Normas Jurídicas'%}</h2>
         </div>
         <div class="homeContent">
             <div class="homeTitle">