diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -10,7 +10,7 @@ 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 +from troggle.core.views.drawings import dwgallfiles, 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 @@ -81,8 +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('dwgupload/<path:folder>', dwgupload, name='dwgupload'), +# Uploads - uploading a file + path('scanupload/<wallet>', scanupload, name='scanupload'), # wallet=2020#01, not a path + path('dwgupload/<path:folder>', dwgupload, name='dwgupload'), path('dwgupload/', dwgupload, name='dwgupload'), # setting LOGIN_URL = '/accounts/login/' is default @@ -157,12 +158,9 @@ trogglepatterns = [ path('survey_scans/<path:path>/<file>', scansingle, name="scansingle"), # The tunnel and therion drawings files pages - re_path(r'^dwgdata/$', dwgdata, name="dwgdata"), - re_path(r'^dwgdataraw/(?P<path>.+?\.xml)$', dwgfilesingle, name="dwgfilesingle"), - 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 + path('dwgfiles', dwgallfiles, name="dwgallfiles"), + path('dwgdataraw/<path:path>', dwgfilesingle, name="dwgfilesingle"), +# path('dwgdataraw/<path:path>/upload', dwgfileupload, name="dwgfileupload"), # Not working # QMs pages - must precede other /caves pages? |