From 4bb188c50c702c206b9124cfff97c6a18ae13953 Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Fri, 6 May 2016 11:12:56 -0300
Subject: [PATCH] Faz modificacoes propostas pela issue 418 fix #418

---
 protocoloadm/views.py                                      | 2 +-
 templates/materia/materialegislativa_filter.html           | 4 +++-
 templates/protocoloadm/documentoadministrativo_filter.html | 3 ++-
 templates/protocoloadm/protocolo_filter.html               | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/protocoloadm/views.py b/protocoloadm/views.py
index da69efca5..5f874ef78 100644
--- a/protocoloadm/views.py
+++ b/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:]
diff --git a/templates/materia/materialegislativa_filter.html b/templates/materia/materialegislativa_filter.html
index e046d19dd..73cd7d681 100644
--- a/templates/materia/materialegislativa_filter.html
+++ b/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 %}
\ No newline at end of file
diff --git a/templates/protocoloadm/documentoadministrativo_filter.html b/templates/protocoloadm/documentoadministrativo_filter.html
index 25cb0afd1..3f70d49ea 100644
--- a/templates/protocoloadm/documentoadministrativo_filter.html
+++ b/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 %}
\ No newline at end of file
diff --git a/templates/protocoloadm/protocolo_filter.html b/templates/protocoloadm/protocolo_filter.html
index 8117dfee0..e0b6b7aa4 100644
--- a/templates/protocoloadm/protocolo_filter.html
+++ b/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 %}
\ No newline at end of file