diff options
| author | Philip Sargent <philip.sargent@klebos.com> | 2021-04-25 04:04:53 +0100 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@klebos.com> | 2021-04-25 04:04:53 +0100 |
| commit | a656ada67a5b7ff81634f0adcb553de295d624f4 (patch) | |
| tree | 6b9dc2cd54673247ee9a3e771adbac0be76cbcca /core | |
| parent | 20c42b14bfd62a18648853fc752873f05ec7fe15 (diff) | |
| download | troggle-a656ada67a5b7ff81634f0adcb553de295d624f4.tar.gz troggle-a656ada67a5b7ff81634f0adcb553de295d624f4.tar.bz2 troggle-a656ada67a5b7ff81634f0adcb553de295d624f4.zip | |
Fixing cave edit form and cave creation parser
Diffstat (limited to 'core')
| -rw-r--r-- | core/forms.py | 4 | ||||
| -rw-r--r-- | core/views/caves.py | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/core/forms.py b/core/forms.py index ff75872..907f6ce 100644 --- a/core/forms.py +++ b/core/forms.py @@ -46,8 +46,8 @@ class CaveForm(ModelForm): def clean(self): if self.cleaned_data.get("kataster_number") == "" and self.cleaned_data.get("unofficial_number") == "": self._errors["unofficial_number"] = self.error_class(["Either the kataster or unoffical number is required."]) - if self.cleaned_data.get("kataster_number") != "" and self.cleaned_data.get("official_name") == "": - self._errors["official_name"] = self.error_class(["This field is required when there is a kataster number."]) +# if self.cleaned_data.get("kataster_number") != "" and self.cleaned_data.get("official_name") == "": +# self._errors["official_name"] = self.error_class(["This field is required when there is a kataster number."]) if self.cleaned_data.get("area") == []: self._errors["area"] = self.error_class(["This field is required."]) if self.cleaned_data.get("url") and self.cleaned_data.get("url").startswith("/"): 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() |