Browse Source

Faz modificacoes propostas pela issue 418

fix #418
pull/417/head
Eduardo Calil 10 years ago
parent
commit
4bb188c50c
  1. 2
      protocoloadm/views.py
  2. 4
      templates/materia/materialegislativa_filter.html
  3. 3
      templates/protocoloadm/documentoadministrativo_filter.html
  4. 4
      templates/protocoloadm/protocolo_filter.html

2
protocoloadm/views.py

@ -400,7 +400,7 @@ class PesquisarDocumentoAdministrativoView(FilterView):
# Então a ordem da URL está diferente
data = self.filterset.data
if (data and data.get('tipo') is not None):
url = "&"+str(self.request.environ['QUERY_STRING'])
url = "&" + str(self.request.environ['QUERY_STRING'])
if url.startswith("&page"):
ponto_comeco = url.find('tipo=') - 1
url = url[ponto_comeco:]

4
templates/materia/materialegislativa_filter.html

@ -13,6 +13,7 @@
{% crispy filter.form %}
<p></p>
{% if filter_url %}
<table class="table table-striped table-bordered">
<thead class="thead-default">
<tr><td><h3>Resultados</h3></td></tr>
@ -23,7 +24,6 @@
{% elif numero_res == 1 %}
<h3>Pesquisa concluída com sucesso! Foi encontrada {{numero_res}} matéria.</h3>
{% endif %}
{% for m in page_obj %}
<tr>
@ -43,6 +43,8 @@
</table>
{% include "paginacao.html" %}
{% endif %}
{% endblock detail_content %}

3
templates/protocoloadm/documentoadministrativo_filter.html

@ -11,7 +11,7 @@
{% crispy filter.form %}
{% if filter_url %}
<p></p>
<table class="table table-striped table-bordered">
<thead class="thead-default">
@ -43,5 +43,6 @@
</table>
{% include "paginacao.html" %}
{% endif %}
{% endblock detail_content %}

4
templates/protocoloadm/protocolo_filter.html

@ -11,7 +11,7 @@
<br></br>
{% crispy filter.form %}
{% if filter_url %}
<p></p>
<table class="table table-striped table-bordered">
<thead class="thead-default">
@ -67,4 +67,6 @@
{% include "paginacao.html" %}
{% endif %}
{% endblock detail_content %}
Loading…
Cancel
Save