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

Fixing cave edit form and cave creation parser

Browse Source
This commit is contained in:
Philip Sargent
2021-04-25 04:04:53 +01:00
parent 20c42b14bf
commit a656ada67a
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/views/caves.py
View File

@@ -227,6 +227,8 @@ def rendercave(request, cave, slug, cave_id=''):
else:
editable = False
#print(f" ! rendercave:'{cave}' svxstem:{svxstem} caveid:'{cave_id}' svx3d:'{svx3d}'")
if not cave_id:
cave_id = slug # cave.unofficial_number
try:
r = render(request,'cave.html', {'cave_editable': editable, 'settings': settings, 'cave': cave, 'cavepage': True,
'cave_id': cave_id, 'svxstem': svxstem, 'svx3d':svx3d})
@@ -335,6 +337,8 @@ def edit_cave(request, slug=None):
myslug = "%s-%s" % (myArea, form.cleaned_data["unofficial_number"])
else:
myslug = slug
# Converting a PENDING cave to a real cave by saving this form
myslug = myslug.replace('-PENDING-', '-')
cave.filename = myslug + ".html"
cave.save()
form.save_m2m()
@@ -389,7 +393,12 @@ def edit_entrance(request, caveslug=None, slug=None):
if form.is_valid() and (slug is not None or entletter.is_valid()):
entrance = form.save(commit = False)
if slug is None:
slugname = cave.slug() + entletter.cleaned_data["entrance_letter"]
if entletter.cleaned_data["entrance_letter"]:
slugname = cave.slug() + entletter.cleaned_data["entrance_letter"]
else:
slugname = cave.slug()
# Converting a PENDING cave to a real cave by saving this form
slugname = slugname.replace('-PENDING-', '-')
entrance.cached_primary_slug = slugname
entrance.filename = slugname + ".html"
entrance.save()