diff options
Diffstat (limited to 'chimere/views.py')
| -rw-r--r-- | chimere/views.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chimere/views.py b/chimere/views.py index 8b824a0..824d912 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -89,9 +89,12 @@ def get_base_response(area_name=""): area_name = area.urn except ObjectDoesNotExist: pass + base_response_dct['area'] = area base_response_dct['area_name'] = area_name if area and area.external_css: base_response_dct['css_area'] = area.external_css + base_response_dct['dynamic_categories'] = True \ + if area and area.dynamic_categories else False base_response_dct['JQUERY_JS_URLS'] = settings.JQUERY_JS_URLS base_response_dct['JQUERY_CSS_URLS'] = settings.JQUERY_CSS_URLS return base_response_dct, None @@ -122,7 +125,7 @@ def index(request, area_name=None, default_area=None, simple=False): 'news_visible': news_visible, 'areas_visible': settings.CHIMERE_DISPLAY_AREAS, 'map_layer':settings.CHIMERE_DEFAULT_MAP_LAYER, - 'dynamic_categories':settings.CHIMERE_DYNAMIC_CATEGORIES, + 'dynamic_categories':response_dct['dynamic_categories'], 'zoomout':zoomout }) tpl = 'chimere/main_map.html' @@ -540,13 +543,14 @@ def get_available_categories(request, area_name=None, area=None, status='A', ''' Get categories for a designed area ''' - if settings.CHIMERE_DYNAMIC_CATEGORIES and \ + context_data, redir = get_base_response(area_name) + area = context_data["area"] + if area and area.dynamic_categories and \ not "current_extent" in request.GET: return "" - context_data, redir = get_base_response(area_name) if redir: return redir - if not settings.CHIMERE_DYNAMIC_CATEGORIES: + if not area or not area.dynamic_categories: # Categories are not updated dynamicaly when the user move the map # so we return ALL the categories subcategories = SubCategory.getAvailable( |