From 5953bfdb54bd36f716d7b36681aae2648e3c1028 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 19 Apr 2015 22:52:43 +0200 Subject: Add a directory with all available markers --- chimere/actions.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'chimere/actions.py') diff --git a/chimere/actions.py b/chimere/actions.py index 8ef5338..5ed3070 100644 --- a/chimere/actions.py +++ b/chimere/actions.py @@ -22,7 +22,7 @@ Actions available in the main interface """ from django.conf import settings from django.contrib.auth import models -from django.core.urlresolvers import reverse +from django.core.urlresolvers import reverse, NoReverseMatch from django.utils.translation import ugettext_lazy as _ from models import Page @@ -33,7 +33,12 @@ class Action: self.extra_url_args, self.url = extra_url_args, None def update_url(self, area_name): - self.url = reverse(self.path, + try: + self.url = reverse(self.path, + args=[area_name if area_name else ''] + self.extra_url_args) + except NoReverseMatch: + # backward url management + self.url = reverse(self.path, args=[area_name + '/' if area_name else ''] + self.extra_url_args) default_actions = [(Action('view', 'chimere:index', _('View')), []), @@ -42,6 +47,10 @@ default_actions = [(Action('view', 'chimere:index', _('View')), []), Action('edit-route', 'chimere:editroute', _('Add a new route'))), ),] +if settings.CHIMERE_DIRECTORY: + default_actions.append((Action('categories', 'chimere:category-directory', + _('Directory')), [])) + if settings.CHIMERE_FEEDS: default_actions.append((Action('rss', 'chimere:feeds-form', _('RSS feeds')), [])) -- cgit v1.2.3 From 18e65759bb7c9c8d9f2c264f9551e77c767ce571 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 16 Jun 2015 17:23:09 +0200 Subject: Add some flexibility for installation with old settings --- chimere/actions.py | 2 +- chimere/views.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'chimere/actions.py') 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 -- cgit v1.2.3