xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

refactor cave import

Browse Source
This commit is contained in:
Philip Sargent
2023-04-22 22:05:12 +01:00
parent 275adc8efa
commit 30ef427b90
2 changed files with 188 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/views/caves.py
View File

@@ -15,7 +15,7 @@ from troggle.core.models.logbooks import CaveSlug, QM
from troggle.core.utils import write_and_commit
from troggle.core.views import expo
from troggle.settings import CAVEDESCRIPTIONS, ENTRANCEDESCRIPTIONS
from troggle.parsers.caves import readcave, readentrance
from troggle.parsers.caves import read_cave, read_entrance
from .auth import login_required_if_public
@@ -392,7 +392,7 @@ def edit_cave(request, path="", slug=None):
else:
# re-read cave data from file.
filename = str(cave.slug() +".html")
readcave(filename, cave=cave)
read_cave(filename, cave=cave)
form = CaveForm(instance=cave)
ceFormSet = CaveAndEntranceFormSet(queryset=cave.caveandentrance_set.all())
@@ -446,7 +446,7 @@ def edit_entrance(request, path="", caveslug=None, entslug=None):
if form.is_valid() and entletter.is_valid():
entrance = form.save(commit=False)
entrance_letter = entletter.save(commit=False)
print(f"- POST {caveslug=} {entslug=} {path=}")
# print(f"- POST {caveslug=} {entslug=} {path=}")
if entslug is None:
if entletter.cleaned_data["entrance_letter"]:
slugname = cave.slug() + entletter.cleaned_data["entrance_letter"]
@@ -467,7 +467,7 @@ def edit_entrance(request, path="", caveslug=None, entslug=None):
else:
# re-read entrance data from file.
filename = str(entrance.slug +".html")
readentrance(filename, ent=entrance)
read_entrance(filename, ent=entrance)
form = EntranceForm(instance=entrance)
if entslug is None: