summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/urls.py b/urls.py
index ea0ce0a..02bd134 100644
--- a/urls.py
+++ b/urls.py
@@ -57,7 +57,7 @@ actualurlpatterns = patterns('',
url(r'^jgtuploadfile$', view_surveys.jgtuploadfile, name="jgtuploadfile"),
url(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent),
- #(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
+ url(r'^cave/(?P<slug>[^/]+)/edit/$', edit_cave, name="edit_cave"),
#(r'^cavesearch', caveSearch),
@@ -83,7 +83,7 @@ actualurlpatterns = patterns('',
url(r'^eyecandy$', views_other.eyecandy),
(r'^admin/doc/?', include('django.contrib.admindocs.urls')),
- url(r'^admin/(.*)', admin.site.root, name="admin"),
+ url(r'^admin/(.*)', admin.site.get_urls, name="admin"),
# don't know why this needs troggle/ in here. nice to get it out
url(r'^troggle/media-admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}),