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
commit129d93dfa74eaa6f8ec6aeefaff38699bca8d40f (patch)
tree30de6c64f4fb6d281c9d15879af5d8940eba3cb1 /urls.py
parent28924db9f87af72343206383e9065841e3fd1c14 (diff)
parent65c55f0f21fe85a678d48842da10e0ea5c917ae5 (diff)
downloadtroggle-129d93dfa74eaa6f8ec6aeefaff38699bca8d40f.tar.gz
troggle-129d93dfa74eaa6f8ec6aeefaff38699bca8d40f.tar.bz2
troggle-129d93dfa74eaa6f8ec6aeefaff38699bca8d40f.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'),