Browse Source

add pesquisa a lista de Expressões Textuais

pull/2169/head
Leandro Roberto 7 years ago
parent
commit
cef296f4e9
  1. 4
      sapl/base/views.py
  2. 6
      sapl/crud/base.py
  3. 2
      sapl/templates/index.html

4
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):

6
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)

2
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">

Loading…
Cancel
Save