From b96d65fcdda5e1993bf9744ae747633f684a0c60 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 28 Sep 2018 10:37:32 +0200
Subject: Display extra categories in description detail

---
 chimere/static/chimere/css/styles.css |  6 ++++++
 chimere/templates/chimere/detail.html | 14 ++++++++++++++
 chimere/views.py                      | 12 ++++++------
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index daed6c0..e1ce87a 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -776,6 +776,12 @@ div#sidebar-container{
     margin:0;
 }
 
+.full-description ul.extra-categories{
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
 .detail-content p.detail_amendment{
     padding:0.2em 0.5em;
     margin: 0.2em 0;
diff --git a/chimere/templates/chimere/detail.html b/chimere/templates/chimere/detail.html
index eaca0e8..5bac2b5 100644
--- a/chimere/templates/chimere/detail.html
+++ b/chimere/templates/chimere/detail.html
@@ -61,6 +61,20 @@
     {%endif%}
     <div class="full-description">
         {% include "chimere/detail_description.html" %}
+        {% if extra_categories %}
+        <h4>{% trans "Also appears in:" %}</h4>
+        <ul class="extra-categories">
+            {% for category in extra_categories %}
+            <li>{% if category.menu_icon.image %}
+                <img src="{{category.menu_icon.image.url}}">
+                {% elif category.icon.image %}
+                <img src="{{category.icon.image.url}}">
+                {% endif %}
+                &nbsp;{{category.name}}
+            </li>
+            {% endfor %}
+        </ul>
+        {% endif %}
     </div>
     <div id='detail_footer'>
         <div id='detail-action-bar'>
diff --git a/chimere/views.py b/chimere/views.py
index 5b54607..421c03e 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -689,12 +689,12 @@ def getDetail(request, area_name, key, popup=False):
                         response_dct['extra_categories'].append(category)
                 except (models.SubCategory.DoesNotExists, ValueError):
                     pass
-    if not response_dct['category']:
-        for idx, cat in enumerate(marker_cats):
-            if not idx:
-                response_dct['category'] = cat
-            else:
-                response_dct['extra_categories'].append(cat)
+    for idx, cat in enumerate(marker_cats):
+        if not idx and not response_dct['category']:
+            response_dct['category'] = cat
+        elif cat not in response_dct['extra_categories'] \
+                and cat != response_dct['category']:
+            response_dct['extra_categories'].append(cat)
     if response_dct['category']:
         response_dct['color'] = response_dct['category'].category.color
 
-- 
cgit v1.2.3