diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-01 15:03:29 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-04-01 15:03:29 +0200 |
| commit | 2db58411d428b3bc044e42f0c14fe67f69637434 (patch) | |
| tree | 39d651e8ab80f3dfb80f23251ce55e1534599211 /chimere/views.py | |
| parent | 273c6c037a87c1ecff8bc0630b0254b74da1ac01 (diff) | |
| parent | df17f73a6568d261a640319b9700596be176fb93 (diff) | |
| download | Chimère-2db58411d428b3bc044e42f0c14fe67f69637434.tar.bz2 Chimère-2db58411d428b3bc044e42f0c14fe67f69637434.zip | |
Merge branch 'master' into nef2
Conflicts:
chimere/templatetags/chimere_tags.py
Diffstat (limited to 'chimere/views.py')
| -rw-r--r-- | chimere/views.py | 5 |
1 files changed, 3 insertions, 2 deletions
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']) |