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 | cfc90deb837002f1e811d0112c314bcce4919ff6 (patch) | |
| tree | 8a9215be364dae7535dcb1bcc85e5a85005fa16b /urls.py | |
| parent | a05fe94d90f3fe81e0cec79558d3a47ab0ead827 (diff) | |
| parent | 1a0e5776069b654796fc9fb9910db491b67fe152 (diff) | |
| download | troggle-cfc90deb837002f1e811d0112c314bcce4919ff6.tar.gz troggle-cfc90deb837002f1e811d0112c314bcce4919ff6.tar.bz2 troggle-cfc90deb837002f1e811d0112c314bcce4919ff6.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'), |