diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-01 15:00:49 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-01 15:00:49 +0200 |
| commit | df17f73a6568d261a640319b9700596be176fb93 (patch) | |
| tree | 2cc1b46e1d77feb996f7b3f38d8af102561240fb | |
| parent | 6cb0937a6f57cd3644669c366dece6a50950d766 (diff) | |
| download | Chimère-df17f73a6568d261a640319b9700596be176fb93.tar.bz2 Chimère-df17f73a6568d261a640319b9700596be176fb93.zip | |
Be more flexible on settings configuration
| -rw-r--r-- | chimere/route.py | 3 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 15 | ||||
| -rw-r--r-- | chimere/views.py | 5 |
3 files changed, 15 insertions, 8 deletions
diff --git a/chimere/route.py b/chimere/route.py index eaa762a..8c4638a 100644 --- a/chimere/route.py +++ b/chimere/route.py @@ -115,6 +115,7 @@ class RoutinoRouter(Router): return lbl router = None -if settings.CHIMERE_ROUTING_ENGINE['ENGINE'] == 'routino': +if hasattr(settings, 'CHIMERE_ROUTING_ENGINE') and \ + settings.CHIMERE_ROUTING_ENGINE['ENGINE'] == 'routino': router = RoutinoRouter() diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index ed835a8..036067f 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -143,7 +143,8 @@ def head_chimere(context): "MAP_LAYER": settings.CHIMERE_DEFAULT_MAP_LAYER, "OSM_CSS_URLS": settings.OSM_CSS_URLS, "OSM_JS_URLS": settings.OSM_JS_URLS, - 'routing':settings.CHIMERE_ENABLE_ROUTING + 'routing': settings.CHIMERE_ENABLE_ROUTING \ + if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') else False } return context_data @@ -159,12 +160,14 @@ def head_form(): @register.inclusion_tag('chimere/blocks/map_menu.html', takes_context=True) def map_menu(context): - context_data = {'routing':settings.CHIMERE_ENABLE_ROUTING} + context_data = {'routing': settings.CHIMERE_ENABLE_ROUTING \ + if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') else False} return context_data @register.inclusion_tag('chimere/blocks/routing.html', takes_context=True) def routing(context): - if not settings.CHIMERE_ENABLE_ROUTING: + if not hasattr(settings, 'CHIMERE_ENABLE_ROUTING') or \ + not settings.CHIMERE_ENABLE_ROUTING: return {'routing':False} context_data = { 'routing':settings.CHIMERE_ENABLE_ROUTING, @@ -183,8 +186,10 @@ def map(context, map_id='map'): context_data['icon_offset_y'] = settings.CHIMERE_ICON_OFFSET_Y context_data['icon_width'] = settings.CHIMERE_ICON_WIDTH context_data['icon_height'] = settings.CHIMERE_ICON_HEIGHT - context_data['routing'] = 'true' if settings.CHIMERE_ENABLE_ROUTING \ - else 'none' + context_data['routing'] = 'true' \ + if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') and \ + settings.CHIMERE_ENABLE_ROUTING \ + else 'none' area_name = context['area_name'] if 'area_name' in context else 'area_name' map_layers, default_area = get_map_layers(area_name) context_data['js_map_layers'] = ", ".join( diff --git a/chimere/views.py b/chimere/views.py index f6e3f84..7c02216 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -155,7 +155,8 @@ def index(request, area_name=None, default_area=None, simple=False, if request.GET and 'lat' in request.GET \ and 'lon' in request.GET: zoomout = None - if settings.CHIMERE_ENABLE_ROUTING: + if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') and \ + settings.CHIMERE_ENABLE_ROUTING: response_dct['itinerary_form'] = RoutingForm() response_dct['routing_transport'] = settings.CHIMERE_ROUTING_TRANSPORT if request.GET and 'current_feature' in request.GET: @@ -177,7 +178,7 @@ def index(request, area_name=None, default_area=None, simple=False, 'has_default_area':Area.objects.filter(default=True).count(), 'zoomout':zoomout }) - if settings.CONTACT_EMAIL: + if hasattr(settings, 'CONTACT_EMAIL') and settings.CONTACT_EMAIL: response_dct['contact_email'] = settings.CONTACT_EMAIL response_dct['share_networks'], net_dct = \ getShareNetwork(request, response_dct['area_name']) |