summaryrefslogtreecommitdiffstats
path: root/core/views
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2022-04-18 22:48:49 +0300
committerPhilip Sargent <philip.sargent@klebos.com>2022-04-18 22:48:49 +0300
commit3813b21dcf5fbec27f5a5d05deca5d302d4e1637 (patch)
treee0f236649bfae88a666099d6eecdfb4d734b751b /core/views
parentccd386ff4e2ed974c61b2f5503bce837fa0c2523 (diff)
downloadtroggle-3813b21dcf5fbec27f5a5d05deca5d302d4e1637.tar.gz
troggle-3813b21dcf5fbec27f5a5d05deca5d302d4e1637.tar.bz2
troggle-3813b21dcf5fbec27f5a5d05deca5d302d4e1637.zip
regularising _URL and _ROOT idiom
Diffstat (limited to 'core/views')
-rw-r--r--core/views/statistics.py8
-rw-r--r--core/views/uploads.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/core/views/statistics.py b/core/views/statistics.py
index bd1d065..02cbd43 100644
--- a/core/views/statistics.py
+++ b/core/views/statistics.py
@@ -49,9 +49,9 @@ def pathsreport(request):
"ROOT_URLCONF" : str( settings.ROOT_URLCONF),
"STATIC_URL" : str( settings.STATIC_URL),
"SURVEX_DATA" : str( settings.SURVEX_DATA),
- "SURVEY_SCANS" : str( settings.SURVEY_SCANS),
+ "SCANS_ROOT" : str( settings.SCANS_ROOT),
# "SURVEYS" : str( settings.SURVEYS),
- "SURVEYS_URL" : str( settings.SURVEYS_URL),
+ "SCANS_URL" : str( settings.SCANS_URL),
"SURVEXPORT" : str( settings.SURVEXPORT),
"DRAWINGS_DATA" : str( settings.DRAWINGS_DATA),
"URL_ROOT" : str( settings.URL_ROOT)
@@ -86,9 +86,9 @@ def pathsreport(request):
"ROOT_URLCONF" : type(settings.ROOT_URLCONF),
"STATIC_URL" : type(settings.STATIC_URL),
"SURVEX_DATA" : type(settings.SURVEX_DATA),
- "SURVEY_SCANS" : type(settings.SURVEY_SCANS),
+ "SCANS_ROOT" : type(settings.SCANS_ROOT),
# "SURVEYS" : type(settings.SURVEYS),
- "SURVEYS_URL" : type(settings.SURVEYS_URL),
+ "SCANS_URL" : type(settings.SCANS_URL),
"SURVEXPORT" : type(settings.SURVEXPORT),
"DRAWINGS_DATA" : type(settings.DRAWINGS_DATA),
"URL_ROOT" : type(settings.URL_ROOT)
diff --git a/core/views/uploads.py b/core/views/uploads.py
index 255b2b6..1d0a510 100644
--- a/core/views/uploads.py
+++ b/core/views/uploads.py
@@ -141,7 +141,7 @@ def scanupload(request, path=None):
wurl = f"/scanupload/{wallet}".replace('#', ':')
wallet = wallet.replace(':','#')
- dirpath = Path(settings.SURVEY_SCANS, year, wallet)
+ dirpath = Path(settings.SCANS_ROOT, year, wallet)
contents_path = dirpath / contentsjson
walletdata = dirpath / contentsjson