diff options
| author | Martin <devnull@localhost> | 2012-08-14 23:49:26 +0200 |
|---|---|---|
| committer | Martin <devnull@localhost> | 2012-08-14 23:49:26 +0200 |
| commit | 71289d9b0fb4046326c2c70e034aa78ac2cd1b97 (patch) | |
| tree | 03dca96408af1b8e494ac7409a6df5bff0bcd0ea /urls.py | |
| parent | a4f9f5bb5a2c1453e96778f898ec150fde5ff56e (diff) | |
| parent | 25a73c4ab7a23d87621c0d90b9c26c69361e8a6a (diff) | |
| download | troggle-71289d9b0fb4046326c2c70e034aa78ac2cd1b97.tar.gz troggle-71289d9b0fb4046326c2c70e034aa78ac2cd1b97.tar.bz2 troggle-71289d9b0fb4046326c2c70e034aa78ac2cd1b97.zip | |
Merge
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -51,8 +51,8 @@ actualurlpatterns = patterns('', url(r'^cave/description/([^/]+)/?$', views_caves.caveDescription), url(r'^cave/qms/([^/]+)/?$', views_caves.caveQMs), url(r'^cave/logbook/([^/]+)/?$', views_caves.caveLogbook), - url(r'^entrance/(?P<slug>[^/]+)/edit/', views_caves.editEntrance, name = "editentrance"), - url(r'^entrance/new/', views_caves.editEntrance, name = "newentrance"), + url(r'^entrance/(?P<caveslug>[^/]+)/(?P<slug>[^/]+)/edit/', views_caves.editEntrance, name = "editentrance"), + url(r'^entrance/new/(?P<caveslug>[^/]+)/', views_caves.editEntrance, name = "newentrance"), #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'), |