summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2021-05-04 02:46:56 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2021-05-04 02:46:56 +0100
commit90bb0759a082755c55083f83bf029a44d225e013 (patch)
tree2b8f51f094c2e2bf12fdb21d3208533c8c357376 /urls.py
parent9ae2e18fe6a25b9dfb0de3bd01916327c5c8a71a (diff)
downloadtroggle-90bb0759a082755c55083f83bf029a44d225e013.tar.gz
troggle-90bb0759a082755c55083f83bf029a44d225e013.tar.bz2
troggle-90bb0759a082755c55083f83bf029a44d225e013.zip
Drawing files upload form
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/urls.py b/urls.py
index 06e7b61..1d5c9c9 100644
--- a/urls.py
+++ b/urls.py
@@ -10,7 +10,9 @@ from django.urls import reverse, resolve
from troggle.core.views import caves, statistics, survex
from troggle.core.views.scans import scansingle, singlewallet, allwallets
-from troggle.core.views.drawings import dwgdata, dwgfilesingle, dwgfileupload
+from troggle.core.views.drawings import dwgdata, dwgfilesingle
+from troggle.core.views.drawings import dwgfileupload
+from troggle.core.views.other import dwgupload
from troggle.core.views.other import troggle404, frontpage, todos, controlpanel, frontpage, scanupload
from troggle.core.views.other import exportlogbook
from troggle.core.views.caves import ent, cavepage
@@ -79,7 +81,9 @@ trogglepatterns = [
re_path(r'^admin/doc/', include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/).
re_path(r'^admin/', admin.site.urls), # includes admin login & logout urls
- path('scanupload/<wallet>', scanupload, name='scanupload'),
+ path('scanupload/<wallet>', scanupload, name='scanupload'),
+ path('dwgupload/<path:folder>', dwgupload, name='dwgupload'),
+ path('dwgupload/', dwgupload, name='dwgupload'),
# setting LOGIN_URL = '/accounts/login/' is default
# url ENDS WITH this string
@@ -158,7 +162,7 @@ trogglepatterns = [
re_path(r'^dwgdataraw/(?P<path>.+?\.th)$', dwgfilesingle, name="dwgfilesingle"),
re_path(r'^dwgdataraw/(?P<path>.+?\.th2)$', dwgfilesingle, name="dwgfilesingle"),
# re_path(r'^dwgdatainfo/(?P<path>.+?\.xml)$', dwgfileinfo, name="dwgfileinfo"), # parses tunnel for info & ref to wallet
- re_path(r'^dwgdataraw/(?P<path>.+?\.xml)/upload$', dwgfileupload, name="dwgfileupload"), # Not working
+# re_path(r'^dwgdataraw/(?P<path>.+?\.xml)/upload$', dwgfileupload, name="dwgfileupload"), # Not working
# QMs pages - must precede other /caves pages?