diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-16 17:23:09 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-16 17:23:09 +0200 |
| commit | 18e65759bb7c9c8d9f2c264f9551e77c767ce571 (patch) | |
| tree | 1320b7544c6d272f7f359da80f98681e2e8a03a2 | |
| parent | 9d4f1c0ea95393ebdfc11f3830720fb3f12eeb3a (diff) | |
| download | Chimère-18e65759bb7c9c8d9f2c264f9551e77c767ce571.tar.bz2 Chimère-18e65759bb7c9c8d9f2c264f9551e77c767ce571.zip | |
Add some flexibility for installation with old settings
| -rw-r--r-- | chimere/actions.py | 2 | ||||
| -rw-r--r-- | chimere/views.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chimere/actions.py b/chimere/actions.py index 5ed3070..e83d8c3 100644 --- a/chimere/actions.py +++ b/chimere/actions.py @@ -47,7 +47,7 @@ default_actions = [(Action('view', 'chimere:index', _('View')), []), Action('edit-route', 'chimere:editroute', _('Add a new route'))), ),] -if settings.CHIMERE_DIRECTORY: +if hasattr(settings, 'CHIMERE_DIRECTORY') and settings.CHIMERE_DIRECTORY: default_actions.append((Action('categories', 'chimere:category-directory', _('Directory')), [])) diff --git a/chimere/views.py b/chimere/views.py index e6adb3e..88619ce 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -185,7 +185,8 @@ def index(request, area_name=None, default_area=None, simple=False, 'zoomout':zoomout, 'has_default_area':Area.objects.filter(default=True).count(), 'zoomout':zoomout, - 'has_search':settings.CHIMERE_SEARCH_ENGINE + 'has_search':hasattr(settings, 'CHIMERE_SEARCH_ENGINE') and \ + settings.CHIMERE_SEARCH_ENGINE }) if hasattr(settings, 'CONTACT_EMAIL') and settings.CONTACT_EMAIL: response_dct['contact_email'] = settings.CONTACT_EMAIL |