summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-13 10:35:37 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-13 10:35:37 +0200
commit3ebe0055ff739d322742be6c851f177a670445e8 (patch)
tree4db70a02abc488afa413765e426fd194ff0dcbef
parent094fde560439bdc2106034d052dca8d2acfc8750 (diff)
downloadChimère-3ebe0055ff739d322742be6c851f177a670445e8.tar.bz2
Chimère-3ebe0055ff739d322742be6c851f177a670445e8.zip
Can use alternate MAIN_INDEX in project
-rw-r--r--chimere/actions.py2
-rw-r--r--chimere/feeds.py2
-rw-r--r--chimere/templatetags/chimere_tags.py6
-rw-r--r--chimere/tests.py2
-rw-r--r--chimere/urls.py8
-rw-r--r--chimere/views.py4
-rw-r--r--settings.py1
7 files changed, 15 insertions, 10 deletions
diff --git a/chimere/actions.py b/chimere/actions.py
index d7c25c9..1425e14 100644
--- a/chimere/actions.py
+++ b/chimere/actions.py
@@ -45,7 +45,7 @@ class Action:
args=[area_name if area_name else ''] + self.extra_url_args)
default_actions = [
- (Action('view', 'chimere:index', _('View')), []),
+ (Action('view', settings.MAIN_INDEX, _('View')), []),
(Action('contribute', 'chimere:edit', _('Contribute')),
(Action('edit-marker', 'chimere:editmarker',
_('Add a new point of interest')),
diff --git a/chimere/feeds.py b/chimere/feeds.py
index 025ceb0..0d619d7 100644
--- a/chimere/feeds.py
+++ b/chimere/feeds.py
@@ -42,7 +42,7 @@ class BaseFeed(Feed):
cat = 0
if item.categories.all() and item.categories.all()[0]:
cat = item.categories.all()[0].pk
- return reverse('chimere:index') + '?zoom=16&lat=%f&lon=%f&'\
+ return reverse(settings.MAIN_INDEX) + '?zoom=16&lat=%f&lon=%f&'\
'current_feature=%d&checked_categories=%d' % (coord.y, coord.x,
item.id, cat)
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index ef25945..1e08d1e 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -30,7 +30,7 @@ def display_areas(context):
Display available areas.
"""
context_data = {"areas": Area.getAvailable(),
- "base_url": reverse('chimere:index')
+ "base_url": reverse(settings.MAIN_INDEX)
}
if "area_name" in context:
context_data['area_name'] = context["area_name"]
@@ -43,7 +43,7 @@ def submited(context):
Submited message.
"""
return {"edit_url": reverse('chimere:edit'),
- "index_url": reverse('chimere:index'),
+ "index_url": reverse(settings.MAIN_INDEX),
'contact_email':
settings.CONTACT_EMAIL if hasattr(settings, 'CONTACT_EMAIL')
else None}
@@ -164,7 +164,7 @@ def head_chimere(context):
"VERSION": get_version(),
"DYNAMIC_CATEGORIES": 'true' if area and area.dynamic_categories
else 'false',
- "EXTRA_URL": reverse("chimere:index"),
+ "EXTRA_URL": reverse(settings.MAIN_INDEX),
"EPSG_DISPLAY_PROJECTION": settings.CHIMERE_EPSG_DISPLAY_PROJECTION,
"EPSG_PROJECTION": settings.CHIMERE_EPSG_PROJECTION,
"DEFAULT_CENTER": settings.CHIMERE_DEFAULT_CENTER,
diff --git a/chimere/tests.py b/chimere/tests.py
index bc5c8f3..af97d87 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -423,7 +423,7 @@ class MainUITest(TestCase):
self.markers = marker_setup()
def test_pages(self):
- url = reverse('chimere:index')
+ url = reverse(settings.MAIN_INDEX)
response = self.client.get(url)
self.assertEqual(200, response.status_code)
url = reverse('chimere:edit')
diff --git a/chimere/urls.py b/chimere/urls.py
index eb49102..70a9844 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -154,6 +154,10 @@ urlpatterns += patterns(
url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?property-choices/'
r'(?P<property_slug>[a-zA-Z0-9_-]+)/$',
'property_choice_list', name='property-choices'),
- # At the end, because it catches large
- url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', 'index', name="index"),
)
+
+if settings.PROJECT_APP != "chimere_example_project":
+ urlpatterns += patterns(
+ # At the end, because it catches large
+ url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', 'index', name="index"),
+ )
diff --git a/chimere/views.py b/chimere/views.py
index bb0c2d1..788236f 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -104,7 +104,7 @@ def get_base_response(request, area_name=""):
current_site.domain in settings.MOBILE_DOMAINS
}
- base_url = reverse("chimere:index")
+ base_url = reverse(settings.MAIN_INDEX)
if not base_url.startswith('/'):
base_url = '/' + base_url
if area_name and area_name.endswith('/'):
@@ -586,7 +586,7 @@ def extraPage(request, area_name="", page_id=""):
try:
page = Page.objects.get(available=True, mnemonic=page_id)
except ObjectDoesNotExist:
- return redirect(reverse('chimere:index'))
+ return redirect(reverse(settings.MAIN_INDEX))
response_dct, redir = get_base_response(request, area_name)
if redir:
return redir
diff --git a/settings.py b/settings.py
index 72368d1..be40000 100644
--- a/settings.py
+++ b/settings.py
@@ -14,6 +14,7 @@ DEBUG_TOOLBAR = False
SQL_DEBUG = False
ROOT_PATH = os.path.realpath(os.path.dirname(__file__)) + "/"
+MAIN_INDEX = "chimere:index"
# Django settings for chimere project.
PROJECT_NAME = 'Chimere'