diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2023-03-28 20:05:38 +0100 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2023-03-28 20:05:38 +0100 |
| commit | e7d9e9402a2a21e0825adc9ad7f4c1327f4c1daf (patch) | |
| tree | 6f3df7e5b102f42f9e62b71790b0bbd748f237fd /core | |
| parent | 3ef5c1aa0bf20d27b00c1f74371f68b2434421dc (diff) | |
| download | troggle-e7d9e9402a2a21e0825adc9ad7f4c1327f4c1daf.tar.gz troggle-e7d9e9402a2a21e0825adc9ad7f4c1327f4c1daf.tar.bz2 troggle-e7d9e9402a2a21e0825adc9ad7f4c1327f4c1daf.zip | |
bugfixes
Diffstat (limited to 'core')
| -rw-r--r-- | core/TESTS/test_imports.py | 2 | ||||
| -rw-r--r-- | core/views/caves.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/TESTS/test_imports.py b/core/TESTS/test_imports.py index 94c7653..28bd65e 100644 --- a/core/TESTS/test_imports.py +++ b/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 diff --git a/core/views/caves.py b/core/views/caves.py index 25a7fee..475671c 100644 --- a/core/views/caves.py +++ b/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}") |