From 58ac0c6435b3b2a53a72db2a3ff3fb12e081b3f3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 15 Mar 2018 12:05:49 +0100 Subject: UI: refactoring --- chimere/views.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'chimere/views.py') diff --git a/chimere/views.py b/chimere/views.py index 932240c..c1e2076 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -636,9 +636,26 @@ def getDetail(request, area_name, key, popup=False): return redir response_dct['marker'] = marker response_dct['popup'] = popup + response_dct['category'] = None + if request.method == 'GET': if 'simple' in request.GET and request.GET['simple']: response_dct['simple'] = True + if 'categories' in request.GET and request.GET['categories']: + response_dct['categories'] = [] + for cat_id in request.GET['categories'].split('-'): + try: + category = models.SubCategory.objects.get( + available=True, pk=int(cat_id)) + if not response_dct['category']: + response_dct['category'] = category + response_dct['categories'].append(category) + except (models.SubCategory.DoesNotExists, ValueError): + pass + if len(response_dct['categories']): + response_dct['color'] = \ + response_dct['categories'][0].category.color + response_dct['share_networks'], net_dct = \ getShareNetwork(request, response_dct['area_name'], marker, geo_type) response_dct['share_url'] = net_dct['url'] @@ -653,6 +670,8 @@ def getDetail(request, area_name, key, popup=False): and marker.start_date response_dct['routing_enabled'] = settings.CHIMERE_ENABLE_ROUTING response_dct['properties'] = marker.getProperties(area_name=area_name) + if popup: + return render(request, 'chimere/detail_popup.html', response_dct) return render(request, 'chimere/detail.html', response_dct) -- cgit v1.2.3