summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2021-03-25 16:15:26 +0000
committerPhilip Sargent <philip.sargent@klebos.com>2021-03-25 16:15:26 +0000
commit8723d62addda7200e26bd20c6aafb1532d1f832c (patch)
tree6cfdea724b74c9e9c086937b6be5a7d7dbc72b78 /urls.py
parent213ada4ae92f6e97f7e159d7af93f8bf49f9dc67 (diff)
downloadtroggle-8723d62addda7200e26bd20c6aafb1532d1f832c.tar.gz
troggle-8723d62addda7200e26bd20c6aafb1532d1f832c.tar.bz2
troggle-8723d62addda7200e26bd20c6aafb1532d1f832c.zip
Survex files subdirectories displayed differently
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/urls.py b/urls.py
index ebc73d2..ba5a67e 100644
--- a/urls.py
+++ b/urls.py
@@ -7,7 +7,7 @@ from django.contrib import admin
from django.urls import reverse, resolve
from troggle.core import views_other, views_caves, views_logbooks, views_statistics, views_survex, view_surveys
-#from troggle.core.views_other import logbook_entry_suggestions
+from troggle.core.views_other import troggle404
from troggle.core.views_caves import ent, prospecting_image
from troggle.core.views_statistics import pathsreport, stats
from flatpages import views as flatviews
@@ -25,6 +25,7 @@ which is vital to writing code for the webapp. So the URL dispatch is declarativ
The API urls return TSV or JSON and are new in July 2020.
"""
+#handler404 = 'troggle.core.views_other.troggle404' # can't get this to work. but 404.html is default anyway
# Many of these patterns do not work because troggle spent many years broken and we have
# not yet restored all the functions. Some may have never been fully implemented in
@@ -102,7 +103,7 @@ actualurlpatterns = [
url(r'^survexfile/(?P<survex_file>.*?)\.log$', views_survex.svxraw),
url(r'^survexfile/(?P<survex_file>.*?)\.err$', views_survex.err),
- url(r'^survexfile/caves', views_survex.survexcaveslist, name="survexcaveslist"),
+ url(r'^survexfile/caves/$', views_survex.survexcaveslist, name="survexcaveslist"),
url(r'^survexfile/(?P<survex_cave>.*)$', views_survex.survexcavesingle, name="survexcavessingle"),
url(r'^survexfileraw/(?P<survex_file>.*?)\.svx$', views_survex.svxraw, name="svxraw"),
@@ -146,6 +147,7 @@ actualurlpatterns = [
urlpatterns = [
url('^%s' % settings.DIR_ROOT, include(actualurlpatterns))
]
+
# When apache is running these prempt Django so Django never sees them.
# NEW apache configurations suggested as of 20 March 2021: