diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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? |