From b47b10835b74fe4e197071a1ed4dca6ca6fdc3a3 Mon Sep 17 00:00:00 2001
From: Edward <edwardoliveira@users.noreply.github.com>
Date: Tue, 7 Mar 2017 20:31:50 -0300
Subject: [PATCH] Fixes #913 (#917)

---
 sapl/norma/models.py                          |  7 +++++++
 sapl/norma/views.py                           | 11 +---------
 .../templates/norma/normajuridica_detail.html |  9 +++++----
 .../templates/norma/normajuridica_filter.html | 20 +++++++++++++++++++
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/sapl/norma/models.py b/sapl/norma/models.py
index a36368e8b..8d5dbce82 100644
--- a/sapl/norma/models.py
+++ b/sapl/norma/models.py
@@ -114,6 +114,13 @@ class NormaJuridica(models.Model):
         verbose_name_plural = _('Normas Jurídicas')
         ordering = ['-data', '-numero']
 
+    def get_normas_relacionadas(self):
+        principais = NormaRelacionada.objects.filter(
+                norma_principal=self.id)
+        relacionadas = NormaRelacionada.objects.filter(
+                norma_relacionada=self.id)
+        return (principais, relacionadas)
+
     def __str__(self):
         return _('%(tipo)s nº %(numero)s de %(data)s') % {
             'tipo': self.tipo,
diff --git a/sapl/norma/views.py b/sapl/norma/views.py
index bdb74c5e0..10dbf4ad2 100644
--- a/sapl/norma/views.py
+++ b/sapl/norma/views.py
@@ -130,16 +130,7 @@ class NormaCrud(Crud):
             return reverse('%s:%s' % (namespace, 'norma_pesquisa'))
 
     class DetailView(Crud.DetailView):
-
-        def get_context_data(self, **kwargs):
-            context = super().get_context_data(**kwargs)
-            principais = NormaRelacionada.objects.filter(
-                norma_principal=self.object.pk)
-            relacionadas = NormaRelacionada.objects.filter(
-                norma_relacionada=self.object.pk)
-            context['principais'] = principais
-            context['relacionadas'] = relacionadas
-            return context
+        pass
 
     class DeleteView(Crud.DeleteView):
 
diff --git a/sapl/templates/norma/normajuridica_detail.html b/sapl/templates/norma/normajuridica_detail.html
index 4e2585988..ab1df921e 100644
--- a/sapl/templates/norma/normajuridica_detail.html
+++ b/sapl/templates/norma/normajuridica_detail.html
@@ -36,8 +36,9 @@
       <div class="row-fluid">
         <div class="col-sm-12">
           <p class="control-label">Relacionamentos</p>
-            {% if principais|length > 0 %}
-              {% for p in principais %}
+
+            {% if object.get_normas_relacionadas.0|length > 0 %}
+              {% for p in object.get_normas_relacionadas.0 %}
                 <div class="form-control-static">
                  <b>{{ p.tipo_vinculo.descricao_ativa }}</b>&nbsp;
                   <a href="{% url 'sapl.norma:normajuridica_detail' p.norma_relacionada.pk %}">
@@ -47,8 +48,8 @@
               {% endfor %}
             {% endif %}
 
-            {% if relacionadas|length > 0 %}
-              {% for r in relacionadas %}
+            {% if object.get_normas_relacionadas.1|length > 0 %}
+              {% for r in object.get_normas_relacionadas.1 %}
                 <div class="form-control-static">
                   <b>{{ r.tipo_vinculo.descricao_passiva }}</b>&nbsp;
                   <a href="{% url 'sapl.norma:normajuridica_detail' r.norma_principal.pk %}">
diff --git a/sapl/templates/norma/normajuridica_filter.html b/sapl/templates/norma/normajuridica_filter.html
index 854340f60..cf0d1017c 100644
--- a/sapl/templates/norma/normajuridica_filter.html
+++ b/sapl/templates/norma/normajuridica_filter.html
@@ -38,6 +38,7 @@
             <th>Ano</th>
             <th>Data</th>
             <th>Ementa</th>
+            <th>Relacionamentos</th>
           </tr>
     		</thead>
         {% for n in page_obj %}
@@ -47,6 +48,25 @@
             <td>{{n.ano}}</td>
             <td>{{n.data}}</td>
             <td>{{n.ementa|safe}}</td>
+            <td>
+                {% for p in n.get_normas_relacionadas.0 %}
+                  <div>
+                   <b>{{ p.tipo_vinculo.descricao_ativa }}</b>&nbsp;
+                    <a href="{% url 'sapl.norma:normajuridica_detail' p.norma_relacionada.pk %}">
+                     {{ p.norma_relacionada }}
+                   </a>
+                  </div>
+                {% endfor %}
+                {% for r in n.get_normas_relacionadas.1 %}
+                <div>
+                  <b>{{ r.tipo_vinculo.descricao_passiva }}</b>&nbsp;
+                    <a href="{% url 'sapl.norma:normajuridica_detail' r.norma_principal.pk %}">
+                      {{ r.norma_principal }}
+                    </a>
+              </div>
+            {% endfor %}
+            </td>
+
     			</tr>
     		{% endfor %}
     	</table>