expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-02-21 20:25:21 +00:00
Code Issues 18 Projects 3 Activity

make tests work

Browse Source
This commit is contained in:
Your Name
2023-11-22 16:54:38 +00:00
parent bd81bd0b01
commit ab1212dd8a
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/fixtures/expo_caves.json
View File

@@ -9,8 +9,6 @@
"equipment": "", "equipment": "",
"references": "", "references": "",
"survey": "CUCC's parts surveyed to Grade 5 but not all drawn up - see <a href=\"41/survey.htm\">here</a>", "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", "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", "survex_file": "smk-system.svx",
"description_file": "1623/115.htm", "description_file": "1623/115.htm",
@@ -29,12 +27,10 @@
"equipment": "<p></p>", "equipment": "<p></p>",
"references": "<p>", "references": "<p>",
"survey": "<p></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": "", "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": "", "survex_file": "",
"description_file": "", "description_file": "",
"url": "1623/284/284.html", "url": "1623/284/284.html",
"filename": "1623-284.html", "filename": "1623-284.html",
"areacode": "1623"}} "areacode": "1623"}}
] ]

1
core/views/auth.py
View File

@@ -57,6 +57,7 @@ def expologin(request):
return render(request, "login/index.html", {}) return render(request, "login/index.html", {})
else: else:
# going to login page when you are already logged in # going to login page when you are already logged in
from django.contrib.admin.templatetags import log
return render(request, "tasks.html", {}) return render(request, "tasks.html", {})
# POST # POST

3
core/views/other.py
View File

@@ -96,12 +96,13 @@ def frontpage(request):
# via django.contrib.messages.middleware.MessageMiddleware # via django.contrib.messages.middleware.MessageMiddleware
# this is set in the templates. # this is set in the templates.
if request.user.is_authenticated: if request.user.is_authenticated:
from django.contrib.admin.templatetags import log
return render(request, "tasks.html") return render(request, "tasks.html")
expeditions = Expedition.objects.order_by("-year") expeditions = Expedition.objects.order_by("-year")
logbookentry = LogbookEntry logbookentry = LogbookEntry
cave = Cave cave = Cave
# from django.contrib.admin.templatetags import log from django.contrib.admin.templatetags import log
return render(request, "frontpage.html", locals()) return render(request, "frontpage.html", locals())