From 06e1fc6b8039d9d84911aae7155057704408f3cb Mon Sep 17 00:00:00 2001 From: Eduardo Calil Date: Thu, 25 May 2017 12:39:44 -0300 Subject: [PATCH] =?UTF-8?q?Coloca=20o=20subnav=20de=20Documento=20Administ?= =?UTF-8?q?rativo=20de=20acordo=20com=20o=20padr=C3=A3o=20do=20sistema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/protocoloadm/views.py | 11 ++++++++++- .../documentoadministrativo_detail.html | 15 --------------- sapl/templates/protocoloadm/subnav.yaml | 5 +++++ 3 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 sapl/templates/protocoloadm/documentoadministrativo_detail.html create mode 100644 sapl/templates/protocoloadm/subnav.yaml diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py index 234f5c13c..03d1d3d6d 100644 --- a/sapl/protocoloadm/views.py +++ b/sapl/protocoloadm/views.py @@ -87,9 +87,18 @@ class DocumentoAdministrativoCrud(Crud): class BaseMixin(Crud.BaseMixin): list_field_names = ['tipo', 'numero', 'ano', 'data', - 'numero_protocolo', 'ano_protocolo', 'assunto', + 'numero_protocolo', 'assunto', 'interessado', 'tramitacao', 'texto_integral'] + @property + def search_url(self): + namespace = self.model._meta.app_config.name + return reverse('%s:%s' % (namespace, 'pesq_doc_adm')) + + @property + def list_url(self): + return '' + class ListView(DocumentoAdministrativoMixin, Crud.ListView): pass diff --git a/sapl/templates/protocoloadm/documentoadministrativo_detail.html b/sapl/templates/protocoloadm/documentoadministrativo_detail.html deleted file mode 100644 index 4e38ce963..000000000 --- a/sapl/templates/protocoloadm/documentoadministrativo_detail.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "crud/detail.html" %} -{% load i18n %} -{% block actions %} -{% load common_tags %} - -
- {% trans 'Tramitações' %} - {% if perms|get_change_perm:view %} - {% trans 'Editar' %} - {% endif %} - {% if perms|get_delete_perm:view %} - {% trans 'Excluir' %} - {% endif %} -
-{% endblock actions %} diff --git a/sapl/templates/protocoloadm/subnav.yaml b/sapl/templates/protocoloadm/subnav.yaml new file mode 100644 index 000000000..22857647b --- /dev/null +++ b/sapl/templates/protocoloadm/subnav.yaml @@ -0,0 +1,5 @@ +{% load i18n common_tags %} +- title: {% trans 'Início' %} + url: documentoadministrativo_detail +- title: {% trans 'Tramitação' %} + url: tramitacaoadministrativo_list