summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorWookey <wookey@wookware.org>2011-07-11 00:49:18 +0100
committerWookey <wookey@wookware.org>2011-07-11 00:49:18 +0100
commitcc8c47f21f8415ba5d37632385d7440e455bf61a (patch)
tree89449484042c1e7a0d39cc35bc22e64708e3027e /urls.py
parent1e1d63c768fb7791f278c164ded138e95fd787e5 (diff)
parent861daee66feb985ccfb9271c211dc1a27263fbf4 (diff)
downloadtroggle-cc8c47f21f8415ba5d37632385d7440e455bf61a.tar.gz
troggle-cc8c47f21f8415ba5d37632385d7440e455bf61a.tar.bz2
troggle-cc8c47f21f8415ba5d37632385d7440e455bf61a.zip
Merge from Martin's tip
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/urls.py b/urls.py
index 3dc4bc2..24df04b 100644
--- a/urls.py
+++ b/urls.py
@@ -44,6 +44,7 @@ actualurlpatterns = patterns('',
url(r'^getLogBookEntries/(?P<expeditionslug>.*)', views_logbooks.get_logbook_entries, name = "get_logbook_entries"),
url(r'^cave/(?P<cave_id>[^/]+)/?$', views_caves.cave, name="cave"),
+ url(r'^caveslug/([^/]+)/?$', views_caves.caveSlug, name="caveSlug"),
url(r'^cavedescription/(?P<cavedescription_name>[^/]+)/?$', views_caves.cave_description, name="cavedescription"),
url(r'^cavedescription/?$', object_list, {'queryset':CaveDescription.objects.all(),'template_name':'object_list.html'}, name="cavedescriptions"),
#url(r'^cavehref/(.+)$', views_caves.cave, name="cave"),url(r'cave'),