From eea74406c9ba0e7554a75e98ae7bb6792a164e11 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Sat, 17 Apr 2021 23:59:11 +0100
Subject: fix template bug for newentrance

---
 urls.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index 74e6737..2895afe 100644
--- a/urls.py
+++ b/urls.py
@@ -100,13 +100,6 @@ trogglepatterns = [
     url(r'^getQMs/(?P<caveslug>.*)', caves.get_qms, name = "get_qms"), 
     url(r'^getEntrances/(?P<caveslug>.*)', caves.get_entrances, name = "get_entrances"), 
 
-# QMs pages - must precede other /caves pages
-    url(r'^cave/qms/([^/]+)/?$', caves.caveQMs), # blank page usually
-    url(r'^cave/(?P<cave_id>[^/]+)/(?P<year>\d\d\d\d)-(?P<qm_id>\d*)(?P<grade>[ABCDX]?)?$', caves.qm, name="qm"),
-    url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', other.downloadQMs, name="downloadqms"),
-    url(r'^newqmnumber/?$', other.ajax_QM_number, ), # blank page if no ch given
-#   url(r'^downloadqms$', other.downloadQMs), # MultiValueDictKeyError
-
 #   Cave description pages
     url(r'^cave/new/$', caves.edit_cave, name="newcave"),
     url(r'^cave/3d/(?P<cave_id>[^/]+)$', caves.cave3d, name="cave3d"),
@@ -117,12 +110,13 @@ trogglepatterns = [
     url(r'^cave/entrance/([^/]+)/?$',    caves.caveEntrance),
     url(r'^cave/description/([^/]+)/?$', caves.caveDescription),
     url(r'^cave/logbook/([^/]+)/?$',     caves.caveLogbook),
-    url(r'^(?P<karea>162\d)(?P<subpath>.*)$',     cavepage,     name="cavepage"), # shorthand /1623/264 BUT url links may break
+    url(r'^(?P<karea>\d\d\d\d)(?P<subpath>.*)$',     cavepage,     name="cavepage"), # shorthand /1623/264 BUT url links may break
+    # Note that urls eg '1623/161/l/rl89a.htm' are handled by cavepage which redirects them to 'expopage'
 
 #   Entrances
-    url(r'^entrance/new/$', caves.edit_entrance, name = "newentrance"), 
     url(r'^entrance/(?P<caveslug>[^/]+)/(?P<slug>[^/]+)/edit/', caves.edit_entrance, name = "editentrance"),
-    
+    url(r'^entrance/new/(?P<caveslug>[^/]+)$', caves.edit_entrance, name = "newentrance"), 
+   
 
     url(r'^statistics/?$',  statistics.stats, name="stats"),
     url(r'^stats/?$',       statistics.stats, name="stats"),
@@ -154,6 +148,14 @@ trogglepatterns = [
 #   url(r'^tunneldatainfo/(?P<path>.+?\.xml)$',       surveys.tunnelfileinfo,    name="tunnelfileinfo"), # parses tunnel for info
     url(r'^tunneldataraw/(?P<path>.+?\.xml)/upload$', surveys.tunnelfileupload,  name="tunnelfileupload"), 
     
+
+# QMs pages - must precede other /caves pages
+    url(r'^cave/qms/([^/]+)/?$', caves.caveQMs), # blank page usually
+    url(r'^cave/(?P<cave_id>[^/]+)/(?P<year>\d\d\d\d)-(?P<qm_id>\d*)(?P<grade>[ABCDX]?)?$', caves.qm, name="qm"),
+    url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', other.downloadQMs, name="downloadqms"),
+    url(r'^newqmnumber/?$', other.ajax_QM_number, ), # blank page if no ch given
+#   url(r'^downloadqms$', other.downloadQMs), # MultiValueDictKeyError
+
 #   Prospecting Guide document
     url(r'^prospecting_guide/$', prospecting),    
     url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"),
-- 
cgit v1.2.3