summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fixtures/expo_caves.json6
-rw-r--r--core/views/auth.py1
-rw-r--r--core/views/other.py3
3 files changed, 4 insertions, 6 deletions
diff --git a/core/fixtures/expo_caves.json b/core/fixtures/expo_caves.json
index eec8600..d0d9012 100644
--- a/core/fixtures/expo_caves.json
+++ b/core/fixtures/expo_caves.json
@@ -9,8 +9,6 @@
"equipment": "",
"references": "",
"survey": "CUCC's parts surveyed to Grade 5 but not all drawn up - see <a href=\"41/survey.htm\">here</a>",
- "kataster_status": "",
- "underground_centre_line": "In dataset",
"notes": "The Austrian Kataster has adopted a very perverse way of numbering things. Their numbers are as follows:</p><ul> <li>115a&nbsp;&nbsp;&nbsp;Stellerwegh&ouml;hle entrance&nbsp;&nbsp;&nbsp;41a</li> <li>115b&nbsp;&nbsp;&nbsp;Stellerwegh&ouml;hle entrance&nbsp;&nbsp;&nbsp;41b</li> <li>115c&nbsp;&nbsp;&nbsp;Stellerwegh&ouml;hle entrance&nbsp;&nbsp;&nbsp;41c ( where ? )</li> <li>115d&nbsp;&nbsp;&nbsp;Schnellzugh&ouml;hle entrance&nbsp;&nbsp;&nbsp;115</li> <li>115e&nbsp;&nbsp;&nbsp;unnamed entrance&nbsp;&nbsp;&nbsp;142</li></ul><p>", "length": "SMK system total 54000m", "depth": "from entrance; SMK system total 1032m", "extent": "SMK system total 2812m",
"survex_file": "smk-system.svx",
"description_file": "1623/115.htm",
@@ -29,12 +27,10 @@
"equipment": "<p></p>",
"references": "<p>",
"survey": "<p></p>",
- "kataster_status": "",
- "underground_centre_line": "",
"notes": "A 25m long (22m deep) resurgence in Altausee. At the bottom, at a depth of 72m, there are large round blocks.", "length": "", "depth": "", "extent": "",
"survex_file": "",
"description_file": "",
"url": "1623/284/284.html",
"filename": "1623-284.html",
"areacode": "1623"}}
-] \ No newline at end of file
+]
diff --git a/core/views/auth.py b/core/views/auth.py
index 63cca2b..59a6c50 100644
--- a/core/views/auth.py
+++ b/core/views/auth.py
@@ -57,6 +57,7 @@ def expologin(request):
return render(request, "login/index.html", {})
else:
# going to login page when you are already logged in
+ from django.contrib.admin.templatetags import log
return render(request, "tasks.html", {})
# POST
diff --git a/core/views/other.py b/core/views/other.py
index 444f0e2..b3cbaf3 100644
--- a/core/views/other.py
+++ b/core/views/other.py
@@ -96,12 +96,13 @@ def frontpage(request):
# via django.contrib.messages.middleware.MessageMiddleware
# this is set in the templates.
if request.user.is_authenticated:
+ from django.contrib.admin.templatetags import log
return render(request, "tasks.html")
expeditions = Expedition.objects.order_by("-year")
logbookentry = LogbookEntry
cave = Cave
- # from django.contrib.admin.templatetags import log
+ from django.contrib.admin.templatetags import log
return render(request, "frontpage.html", locals())