expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 08:41:51 +00:00
Code Issues 19 Projects 3 Activity

bugfix

Browse Source
This commit is contained in:
Philip Sargent 2022-07-19 19:06:56 +03:00
parent 3db9c16082
commit 23462df49c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/utils.py
View File

@ -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

4
core/views/caves.py
View File

@ -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})

7
templates/qm.html
View File

@ -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>.