Fixing cave edit form and cave creation parser

1 files changed, 10 insertions, 1 deletions

diff --git a/core/views/caves.py b/core/views/caves.py
index fed3614..efccd8f 100644
--- a/core/views/caves.py
+++ b/core/views/caves.py
@@ -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()