Bug fixes to allow adding of a new cave. No longer ask users about filenames or urls.

1 files changed, 7 insertions, 1 deletions

diff --git a/core/views/caves.py b/core/views/caves.py
index db47a74..187517c 100644
--- a/core/views/caves.py
+++ b/core/views/caves.py
@@ -268,6 +268,8 @@ def rendercave(request, cave, slug, cave_id=""):
             svxstem = Path(settings.SURVEX_DATA) / Path(cave.survex_file)
             # print(f" ! rendercave: slug:'{slug}' '' ++ '{svxstem}'")
         except:
+            svx3d = ""
+            svxstem = ""
             print(f" ! rendercave: slug:'{slug}' FAIL TO MANAGE survex file:'{cave.survex_file}'")
         # NOTE the template itself loads the 3d file using javascript before it loads anything else.
         # Django cannot see what this javascript is doing, so we need to ensure that the 3d file exists first.
@@ -374,10 +376,14 @@ def edit_cave(request, path="", slug=None):
         if form.is_valid() and ceFormSet.is_valid():
             # print(f'! POST is valid. {cave}')
             cave = form.save(commit=False)
+            if not cave.filename:
+                cave.filename = form.get_area() + "-" + cave.number() + ".html"
+            if not cave.url:
+                cave.url = form.get_area() + "/" + cave.number() + ".html"
             cave.save()
             form.save_m2m()
             if slug is None:
-                cs = CaveSlug(cave=cave, slug=form.cleaned_data["cave_slug"], primary=True)
+                cs = CaveSlug(cave=cave, slug=cave.reference(), primary=True)
                 cs.save()
             ceinsts = ceFormSet.save(commit=False)
             for ceinst in ceinsts: