forked from expo/troggle
fix template bug for newentrance
This commit is contained in:
Philip Sargent
parent
d4317b5fd3
commit
eea74406c9
@ -5,11 +5,13 @@ Modified for Expo April 2021.
|
||||
import unittest
|
||||
import re
|
||||
from django.test import TestCase, SimpleTestCase, TransactionTestCase, Client
|
||||
from troggle.core.models.caves import Cave
|
||||
|
||||
|
||||
class FixturePageTests(TestCase):
|
||||
# The fixtures have a password hash which is compatible with plain-text password 'secretword'
|
||||
fixtures = ['auth_users', 'expo_areas', 'expo_caves']
|
||||
ph = r'and leads in 800m of tortuous going to'
|
||||
|
||||
def setUp(self):
|
||||
from django.contrib.auth.models import User
|
||||
@ -18,4 +20,25 @@ class FixturePageTests(TestCase):
|
||||
def tearDown(self):
|
||||
pass
|
||||
|
||||
|
||||
def test_fix_cave_loaded(self):
|
||||
c = Cave.objects.get(kataster_number='115')
|
||||
self.assertEqual(str(c.description_file), "1623/115.htm")
|
||||
self.assertEqual(str(c.url), "1623/115.htm")
|
||||
self.assertEqual(str(c.filename), "1623-115.html")
|
||||
|
||||
ph = self.ph
|
||||
phmatch = re.search(ph, c.underground_description)
|
||||
self.assertIsNotNone(phmatch, "In fixture-loaded cave, failed to find expected text: '" + ph +"'")
|
||||
|
||||
def test_fix_cave_url(self):
|
||||
ph = self.ph
|
||||
response = self.client.get('1623/115.htm')
|
||||
#self.assertEqual(response.status_code, 200)
|
||||
|
||||
content = response.content.decode()
|
||||
phmatch = re.search(ph, content)
|
||||
with open('cave-op.html', 'w') as f:
|
||||
f.write(content)
|
||||
self.assertIsNotNone(phmatch, "Failed to find expected text: '" + ph +"'")
|
||||
|
||||
|
||||
@ -1,3 +1,20 @@
|
||||
[{"model": "core.cave", "pk": 43, "fields":
|
||||
{"new_since_parsing": false, "non_public": false, "official_name": "Schnellzughöhle", "kataster_code": "6/t/S/W x", "kataster_number": "115", "unofficial_number": "40m", "explorers": "CUCC 1980-1985", "underground_description": "This is the main entrance through which the majority of the <a href=\"41.htm\">Stellerweghöhle</a> system was explored. See the separate <a href=\"41/115.htm#ent115\">full guidebook description</a> for details, just an overview is given here.</p><p>The entrance leads to a non-obvious way on to the head of the short <b>Bell Pitch</b>, from where very awkward going leads out to a bigger passage to reach <b>The Ramp</b> a series of off-vertical pitches. The damper but technically easier <b>Inlet Pitches</b> drop to a Big Chamber, from where <b>Pete's Purgatory</b> starts, and leads in 800m of tortuous going to <b>The Confluence</b> and the larger streamway leading to the deepest point.</p><p>Better is the <b>Purgatory Bypass</b> which starts as dry fossil tubes, with a choice of routes to reach <b>Junction Chamber</b> where the <b>Big Rift</b> of <a href=\"41.htm\">Stellerweghöhle</a> enters. Opposite, the huge fossil tube of <b>Dartford Tunnel</b> makes for easy progress to the Confluence, about halfway down the system. The continuing main streamway is interrupted by a bypassable sump and numerous pitches before a low airspace duck at the end of an unpromising canal leads to the spectacular <b>Orgasm Chasm</b>. Careful rigging avoids the water in this 140m shaft, ending in muddy passage and another short drop to a deep and terminal sump. ", "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 Stellerweghöhle entrance 41a</li> <li>115b Stellerweghöhle entrance 41b</li> <li>115c Stellerweghöhle entrance 41c ( where ? )</li> <li>115d Schnellzughöhle entrance 115</li> <li>115e unnamed entrance 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", "url": "1623/115.htm", "filename": "1623-115.html", "area": [1, 8]}}
|
||||
{"new_since_parsing": false, "non_public": false,
|
||||
"official_name": "Schnellzughöhle",
|
||||
"kataster_code": "6/t/S/W x",
|
||||
"kataster_number": "115",
|
||||
"unofficial_number": "40m",
|
||||
"explorers": "CUCC 1980-1985",
|
||||
"underground_description": "This is the main entrance through which the majority of the <a href=\"41.htm\">Stellerweghöhle</a> system was explored. See the separate <a href=\"41/115.htm#ent115\">full guidebook description</a> for details, just an overview is given here.</p><p>The entrance leads to a non-obvious way on to the head of the short <b>Bell Pitch</b>, from where very awkward going leads out to a bigger passage to reach <b>The Ramp</b> a series of off-vertical pitches. The damper but technically easier <b>Inlet Pitches</b> drop to a Big Chamber, from where <b>Pete's Purgatory</b> starts, and leads in 800m of tortuous going to <b>The Confluence</b> and the larger streamway leading to the deepest point.</p><p>Better is the <b>Purgatory Bypass</b> which starts as dry fossil tubes, with a choice of routes to reach <b>Junction Chamber</b> where the <b>Big Rift</b> of <a href=\"41.htm\">Stellerweghöhle</a> enters. Opposite, the huge fossil tube of <b>Dartford Tunnel</b> makes for easy progress to the Confluence, about halfway down the system. The continuing main streamway is interrupted by a bypassable sump and numerous pitches before a low airspace duck at the end of an unpromising canal leads to the spectacular <b>Orgasm Chasm</b>. Careful rigging avoids the water in this 140m shaft, ending in muddy passage and another short drop to a deep and terminal sump. ",
|
||||
"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 Stellerweghöhle entrance 41a</li> <li>115b Stellerweghöhle entrance 41b</li> <li>115c Stellerweghöhle entrance 41c ( where ? )</li> <li>115d Schnellzughöhle entrance 115</li> <li>115e unnamed entrance 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",
|
||||
"url": "1623/115.htm",
|
||||
"filename": "1623-115.html",
|
||||
"area": [1, 8]}}
|
||||
]
|
||||
@ -226,9 +226,16 @@ def rendercave(request, cave, slug, cave_id=''):
|
||||
editable = True
|
||||
else:
|
||||
editable = False
|
||||
print(" ! rendercave:'{}' svxstem:{} svx3d:'{}'".format(cave, svxstem, svx3d))
|
||||
return render(request,'cave.html', {'cave_editable': editable, 'settings': settings, 'cave': cave, 'cavepage': True,
|
||||
'cave_id': cave_id, 'svxstem': svxstem, 'svx3d':svx3d})
|
||||
#print(f" ! rendercave:'{cave}' svxstem:{svxstem} caveid:'{cave_id}' svx3d:'{svx3d}'")
|
||||
try:
|
||||
r = render(request,'cave.html', {'cave_editable': editable, 'settings': settings, 'cave': cave, 'cavepage': True,
|
||||
'cave_id': cave_id, 'svxstem': svxstem, 'svx3d':svx3d})
|
||||
return r
|
||||
except:
|
||||
raise
|
||||
return render(request,'errors/generic.html', {'cave_editable': editable, 'settings': settings, 'cave': cave, 'cavepage': True,
|
||||
'cave_id': cave_id, 'svxstem': svxstem, 'svx3d':svx3d})
|
||||
|
||||
|
||||
def cavepage(request, karea, subpath):
|
||||
'''Displays a cave description page
|
||||
@ -249,10 +256,12 @@ def cavepage(request, karea, subpath):
|
||||
return expo.expopage(request, path)
|
||||
except Cave.MultipleObjectsReturned:
|
||||
caves = Cave.objects.filter(url = path)
|
||||
# we should have a -several variant for the cave pages, not just the svxcaves:
|
||||
return render(request, 'svxcaveseveral.html', {'settings': settings, "caves":caves })
|
||||
except:
|
||||
return render(request, 'pagenotfound.html', {'path': path})
|
||||
|
||||
raise
|
||||
return render(request, 'pagenotfound.html', {'path': path}) # it does not seem possible to set the status_code to '404'
|
||||
|
||||
def cave(request, cave_id='', offical_name=''):
|
||||
'''Displays a cave description page
|
||||
accesssed by a fairly random id which might be anything
|
||||
|
||||
@ -71,6 +71,7 @@ MAX_LOGBOOK_ENTRY_TITLE_LENGTH = 200
|
||||
DEFAULT_LOGBOOK_PARSER = "Parseloghtmltxt"
|
||||
DEFAULT_LOGBOOK_FILE = "logbook.html"
|
||||
# All years since 2010 use the default value for Logbook parser
|
||||
# but several don't work, and are skipped by the parsing code, e.g. 1983
|
||||
LOGBOOK_PARSER_SETTINGS = {
|
||||
"2010": ("2010/logbook.html", "Parseloghtmltxt"),
|
||||
"2009": ("2009/2009logbook.txt", "Parselogwikitxt"),
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
<p style="text-align:right">
|
||||
<a href="{% url "newcave" %}">New Cave</a><br>
|
||||
<a href="{% url "newentrance" %}">New Entrance</a><br>
|
||||
<a href="{% url "newentrance" "1623-000" %}">New Entrance</a><br>
|
||||
<a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
|
||||
</p>
|
||||
<h3>1623</h3>
|
||||
|
||||
@ -1,38 +1,12 @@
|
||||
{% extends 'base.html' %}
|
||||
{% block extrahead %}
|
||||
<style>
|
||||
div#editLinks {
|
||||
Zposition:absolute;
|
||||
background: #999;
|
||||
bottom:0px;
|
||||
right:0px;
|
||||
font-family: "Courier New", Courier, monospace;
|
||||
filter:alpha(opacity=75);
|
||||
-moz-opacity:.75;
|
||||
opacity:.75;
|
||||
text-align:right;
|
||||
}
|
||||
|
||||
div#editLinks a{
|
||||
color:#FFF;
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
{% block title %}Website Error - {% endblock %}
|
||||
{% block content %}
|
||||
|
||||
<div class='middle'>
|
||||
<h2>Website Error</h2>
|
||||
</div>
|
||||
<div id="editLinks"> {% block loginInfo %}
|
||||
<a href="/">Home</a> |
|
||||
<a id="cuccLink" href="http://camcaving.uk/">CUCC</a> |
|
||||
<a id="expoWebsiteLink" href="http://expo.survex.com">expo.survex</a> |
|
||||
{% if user.username %}User:{{ user.username }}
|
||||
{% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>){% endif %}
|
||||
| <a <a href='/accounts/logout/'>Log out</a> {% else %} <a href='/accounts/login/'>Log in</a> {% endif %}
|
||||
</div>
|
||||
{% endblock%}
|
||||
|
||||
|
||||
<div style='width: 300px;' class='middle3 login'>
|
||||
<div class='align-center'>
|
||||
|
||||
@ -34,7 +34,7 @@ div#editLinks a{
|
||||
</div>
|
||||
{% endblock%}
|
||||
|
||||
<p>Probably a mistake. But you can use <a href="{%url "editexpopage" path %}">this link</a>
|
||||
<p>Probably a mistake. But you can try <a href="{%url "editexpopage" path %}">this link</a> or <a href="{{ path }}/edit">this one</a> to fix a real error.
|
||||
<p>
|
||||
or 'Edit this page' in the menu on the left to create this page if you are logged in.
|
||||
<ul>
|
||||
|
||||
22
urls.py
22
urls.py
@ -100,13 +100,6 @@ trogglepatterns = [
|
||||
url(r'^getQMs/(?P<caveslug>.*)', caves.get_qms, name = "get_qms"),
|
||||
url(r'^getEntrances/(?P<caveslug>.*)', caves.get_entrances, name = "get_entrances"),
|
||||
|
||||
# QMs pages - must precede other /caves pages
|
||||
url(r'^cave/qms/([^/]+)/?$', caves.caveQMs), # blank page usually
|
||||
url(r'^cave/(?P<cave_id>[^/]+)/(?P<year>\d\d\d\d)-(?P<qm_id>\d*)(?P<grade>[ABCDX]?)?$', caves.qm, name="qm"),
|
||||
url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', other.downloadQMs, name="downloadqms"),
|
||||
url(r'^newqmnumber/?$', other.ajax_QM_number, ), # blank page if no ch given
|
||||
# url(r'^downloadqms$', other.downloadQMs), # MultiValueDictKeyError
|
||||
|
||||
# Cave description pages
|
||||
url(r'^cave/new/$', caves.edit_cave, name="newcave"),
|
||||
url(r'^cave/3d/(?P<cave_id>[^/]+)$', caves.cave3d, name="cave3d"),
|
||||
@ -117,12 +110,13 @@ trogglepatterns = [
|
||||
url(r'^cave/entrance/([^/]+)/?$', caves.caveEntrance),
|
||||
url(r'^cave/description/([^/]+)/?$', caves.caveDescription),
|
||||
url(r'^cave/logbook/([^/]+)/?$', caves.caveLogbook),
|
||||
url(r'^(?P<karea>162\d)(?P<subpath>.*)$', cavepage, name="cavepage"), # shorthand /1623/264 BUT url links may break
|
||||
url(r'^(?P<karea>\d\d\d\d)(?P<subpath>.*)$', cavepage, name="cavepage"), # shorthand /1623/264 BUT url links may break
|
||||
# Note that urls eg '1623/161/l/rl89a.htm' are handled by cavepage which redirects them to 'expopage'
|
||||
|
||||
# Entrances
|
||||
url(r'^entrance/new/$', caves.edit_entrance, name = "newentrance"),
|
||||
url(r'^entrance/(?P<caveslug>[^/]+)/(?P<slug>[^/]+)/edit/', caves.edit_entrance, name = "editentrance"),
|
||||
|
||||
url(r'^entrance/new/(?P<caveslug>[^/]+)$', caves.edit_entrance, name = "newentrance"),
|
||||
|
||||
|
||||
url(r'^statistics/?$', statistics.stats, name="stats"),
|
||||
url(r'^stats/?$', statistics.stats, name="stats"),
|
||||
@ -154,6 +148,14 @@ trogglepatterns = [
|
||||
# url(r'^tunneldatainfo/(?P<path>.+?\.xml)$', surveys.tunnelfileinfo, name="tunnelfileinfo"), # parses tunnel for info
|
||||
url(r'^tunneldataraw/(?P<path>.+?\.xml)/upload$', surveys.tunnelfileupload, name="tunnelfileupload"),
|
||||
|
||||
|
||||
# QMs pages - must precede other /caves pages
|
||||
url(r'^cave/qms/([^/]+)/?$', caves.caveQMs), # blank page usually
|
||||
url(r'^cave/(?P<cave_id>[^/]+)/(?P<year>\d\d\d\d)-(?P<qm_id>\d*)(?P<grade>[ABCDX]?)?$', caves.qm, name="qm"),
|
||||
url(r'^cave/(?P<cave_id>[^/]+)/qm\.csv/?$', other.downloadQMs, name="downloadqms"),
|
||||
url(r'^newqmnumber/?$', other.ajax_QM_number, ), # blank page if no ch given
|
||||
# url(r'^downloadqms$', other.downloadQMs), # MultiValueDictKeyError
|
||||
|
||||
# Prospecting Guide document
|
||||
url(r'^prospecting_guide/$', prospecting),
|
||||
url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user