Detail: manage default category when no category is selected

1 files changed, 9 insertions, 4 deletions

diff --git a/chimere/views.py b/chimere/views.py
index d7e552e..3ff8059 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -651,6 +651,7 @@ def getDetail(request, area_name, key, popup=False):
     response_dct['marker'] = marker
     response_dct['popup'] = popup
     response_dct['category'] = None
+    response_dct['extra_categories'] = []
 
     marker_cats = list(marker.categories.all())
 
@@ -658,7 +659,6 @@ def getDetail(request, area_name, key, popup=False):
         if 'simple' in request.GET and request.GET['simple']:
             response_dct['simple'] = True
         if 'categories' in request.GET and request.GET['categories']:
-            response_dct['extra_categories'] = []
             for cat_id in request.GET['categories'].split('-'):
                 try:
                     category = models.SubCategory.objects.get(
@@ -671,9 +671,14 @@ def getDetail(request, area_name, key, popup=False):
                         response_dct['extra_categories'].append(category)
                 except (models.SubCategory.DoesNotExists, ValueError):
                     pass
-            if response_dct['category']:
-                response_dct['color'] = \
-                    response_dct['category'].category.color
+    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)
+    if response_dct['category']:
+        response_dct['color'] = response_dct['category'].category.color
 
     response_dct['share_networks'], net_dct = \
         getShareNetwork(request, response_dct['area_name'], marker, geo_type)