diff options
Diffstat (limited to 'core/views/caves.py')
| -rw-r--r-- | core/views/caves.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/core/views/caves.py b/core/views/caves.py index 4af4217..6c11519 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -1,5 +1,6 @@ import os import re +import django import subprocess import tempfile import zipfile @@ -14,7 +15,7 @@ from django.shortcuts import render, redirect from django.urls import NoReverseMatch, reverse import troggle.settings as settings -from troggle.core.forms import CaveAndEntranceFormSet, CaveForm, EntranceForm, EntranceLetterForm +from troggle.core.forms import CaveForm, EntranceForm, EntranceLetterForm # CaveAndEntranceFormSet, from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, GetCaveLookup, get_cave_leniently from troggle.core.models.logbooks import QM from troggle.core.models.wallets import Wallet @@ -472,8 +473,7 @@ def edit_cave(request, path="", slug=None): if request.POST: form = CaveForm(request.POST, instance=cave) - #ceFormSet = CaveAndEntranceFormSet(request.POST) - if form.is_valid(): # and ceFormSet.is_valid(): + if form.is_valid(): print(f'edit_cave(): POST is valid. Editing {cave}') cave = form.save(commit=False) # print(cave) @@ -489,10 +489,6 @@ def edit_cave(request, path="", slug=None): cs = CaveSlug(cave=cave, slug=slug, primary=True) print(f"edit_cave(): New CaveSlug saved {slug}") cs.save() - #ceinsts = ceFormSet.save(commit=False) - #for ceinst in ceinsts: - # ceinst.cave = cave - # ceinst.save() try: cave_file = cave.file_output() write_and_commit([cave_file], f"Online edit of cave {cave}") @@ -523,20 +519,24 @@ def edit_cave(request, path="", slug=None): raise form = CaveForm(instance=cave, initial={'cave_slug': cave.slug()}) - #ceFormSet = CaveAndEntranceFormSet(queryset=cave.caveandentrance_set.all()) else: form = CaveForm() - #ceFormSet = CaveAndEntranceFormSet(queryset=CaveAndEntrance.objects.none()) + # The way formsets are rendered chnaged between Django 4 and Django 5 + major, _, _, _, _ = django.VERSION + if major < 5: + tabletype = "table" + else: + tabletype = "div" + print(f"edit_cave(): returning render() with tabletype={tabletype} {django.VERSION} ") + - print(f"edit_cave(): returning render()") return render( request, "editcave.html", { "form": form, "cave": cave, - "message": message, "year": current_expo(), - #"caveAndEntranceFormSet": ceFormSet, + "message": message, "year": current_expo(), "tabletype": tabletype, "path": path + "/", # used for saving images if attached }, ) |