diff options
| -rw-r--r-- | core/utils.py | 1 | ||||
| -rw-r--r-- | core/views/caves.py | 4 | ||||
| -rw-r--r-- | templates/qm.html | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/core/utils.py b/core/utils.py index 924dac3..c9afdd5 100644 --- a/core/utils.py +++ b/core/utils.py @@ -6,6 +6,7 @@ import resource import random import logging import subprocess +from pathlib import Path from urllib.parse import urljoin from decimal import Decimal, getcontext diff --git a/core/views/caves.py b/core/views/caves.py index 018a557..edf5c4a 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -345,7 +345,7 @@ def edit_cave(request, slug=None): except PermissionError: message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {cave.filename}. Ask a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) - except SubprocessError: + except subprocess.SubprocessError: message = f'CANNOT git on server for this file {cave.filename}. Edits may not be committed.\nAsk a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) @@ -415,7 +415,7 @@ def edit_entrance(request, caveslug=None, slug=None): except PermissionError: message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {entrance.filename}. Ask a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) - except SubprocessError: + except subprocess.SubprocessError: message = f'CANNOT git on server for this file {entrance.filename}. Edits may not be committed.\nAsk a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) diff --git a/templates/qm.html b/templates/qm.html index de91f8a..760f010 100644 --- a/templates/qm.html +++ b/templates/qm.html @@ -10,9 +10,10 @@ </ul> <p>QMs are also loaded directly from the survex files, e.g. see <ul> - <li><a href="{% url 'caveQMs' '1623-264' %}">1623-264 QMs</a> - <li><a href="{% url 'caveQMs' '1623-258' %}">1623-258 QMs</a> - <li><a href="{% url 'caveQMs' '1623-290' %}">1623-290 QMs</a> + <li><a href="{% url 'caveQMs' '1623-264' %}">1623-264 QMs</a> Balkon + <li><a href="{% url 'caveQMs' '1623-258' %}">1623-258 QMs</a> Tunnocks + <li><a href="{% url 'caveQMs' '1623-290' %}">1623-290 QMs</a> Fischgesicht + <li><a href="{% url 'caveQMs' '1626-359' %}">1626-359 QMs</a> Homecoming (2018-dm-07) </ul> <p>For full explanation of the current status of the QM system(s), see <a href="/handbook/troggle/scriptsqms.html">scriptsqms page</a>. |