bugfixes

core/TESTS/test_imports.py

@@ -84,7 +84,7 @@ class SimpleTest(SimpleTestCase):
 
         import troggle.core.views.expo
         from troggle.core.forms import CaveAndEntranceFormSet, CaveForm, EntranceForm, EntranceLetterForm
-        from troggle.core.models.caves import Area, Cave, CaveAndEntrance, Entrance, EntranceSlug, SurvexStation
+        from troggle.core.models.caves import Area, Cave, CaveAndEntrance, Entrance, SurvexStation #EntranceSlug, 
         from troggle.core.models.troggle import Expedition
         from troggle.core.views.auth import login_required_if_public
 

core/views/caves.py

@@ -419,7 +419,7 @@ def edit_entrance(request, path="", caveslug=None, slug=None):
         return render(request, "errors/badslug.html", {"badslug": f"{slug} {caveslug} - from edit_entrance()"})
 
     if slug:
-        entrance = Entrance.objects.get(entranceslug__slug=slug)
+        # entrance = Entrance.objects.get(entranceslug__slug=slug)
         caveAndEntrance = CaveAndEntrance.objects.get(entrance=entrance, cave=cave)
         entlettereditable = False
     else:
@@ -441,9 +441,9 @@ def edit_entrance(request, path="", caveslug=None, slug=None):
                 entrance.cached_primary_slug = slugname
                 entrance.filename = slugname + ".html"
             entrance.save()
-            if slug is None:
-                es = EntranceSlug(entrance=entrance, slug=slugname, primary=True)
-                es.save()
+            # if slug is None:
+                # es = EntranceSlug(entrance=entrance, slug=slugname, primary=True)
+                # es.save()
             entrance_file = entrance.file_output()
             cave_file = cave.file_output()
             write_and_commit([entrance_file, cave_file], f"Online edit of {cave}{entletter}")