From fa6758b9a0d8229d919b917687b703980de0fb84 Mon Sep 17 00:00:00 2001
From: Martin Green <martin.speleo@gmail.com>
Date: Sun, 31 Jul 2022 21:29:17 +0200
Subject: edit entrances within the correct url parent

---
 urls.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index 1c17b21..d89912f 100644
--- a/urls.py
+++ b/urls.py
@@ -130,15 +130,19 @@ trogglepatterns = [
     #re_path(r'^cave/description/([^/]+)/?$', caves.caveDescription), #!!!BAD, local links fail..
     #re_path(r'^cave/(?P<cave_id>[^/]+)/?$', caves.cave, name="cave"), # used only in testing !? XXXXXXXXXXXXXXXXXXXXXXXXXX
     #re_path(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent), #!!!BAD, local links fail..# view_caves.ent
+    
+#   Edit caves and entrances
     re_path(r'^(?P<path>.*)/(?P<slug>[^/]+)_cave_edit/$',           edit_cave, name="edit_cave"), # edit_cave needed by cave.html template for url matching
+    re_path(r'^(?P<path>.*)/(?P<caveslug>[^/]+):(?P<slug>[^:]+)_entrance_edit', edit_entrance, name = "editentrance"), #edit existing entrance
+    re_path(r'^(?P<path>.*)/(?P<caveslug>[^/]+)_entrance_new$', edit_entrance, name = "newentrance"), # new entrance for a cave
+    
     re_path(r'^(.*)_edit$',         editexpopage, name="editexpopage"),
     re_path(r'^(?P<karea>\d\d\d\d)(?P<subpath>.*)$',   cavepage,  name="cavepage"), # shorthand /1623/264 or 1623/161/top.htm
     # Note that urls eg '/1623/161/l/rl89a.htm' are handled by cavepage which redirects them to 'expopage'    # Note that _edit$ for a cave description page in a subfolder e.g. /1623/204/204.html_edit  gets caught here and breaks with 404
 
 #   Entrances
     re_path(r'^cave/entrance/([^/]+)/?$',    caveEntrance), # lists all entrances !!!BAD, local links fail
-    re_path(r'^entrance/(?P<caveslug>[^/]+)/(?P<slug>[^/]+)/edit/', edit_entrance, name = "editentrance"), #edit existing entrance
-    re_path(r'^entrance/new/(?P<caveslug>[^/]+)$', edit_entrance, name = "newentrance"), # new entrance for a cave
+
    
 # System admin and monitoring
     path('statistics',  statistics.stats, name="stats"),
-- 
cgit v1.2.3