xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

improved areacode check in Cave edit form

Browse Source
This commit is contained in:
Philip Sargent
2025-07-13 11:36:39 +03:00
parent 38744a1781
commit d19e60976e
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/forms.py
View File

@@ -103,7 +103,7 @@ class CaveForm(ModelForm):
length = forms.CharField(required=False, label="Length (m)", widget=forms.TextInput(attrs={"placeholder": "usually blank"})) length = forms.CharField(required=False, label="Length (m)", widget=forms.TextInput(attrs={"placeholder": "usually blank"}))
depth = forms.CharField(required=False, label="Depth (m)", widget=forms.TextInput(attrs={"placeholder": "usually blank"})) depth = forms.CharField(required=False, label="Depth (m)", widget=forms.TextInput(attrs={"placeholder": "usually blank"}))
extent = forms.CharField(required=False, label="Extent (m)", widget=forms.TextInput(attrs={"placeholder": "usually blank"})) extent = forms.CharField(required=False, label="Extent (m)", widget=forms.TextInput(attrs={"placeholder": "usually blank"}))
areacode = forms.CharField(required=False, label="Area code", widget=forms.TextInput(attrs={"placeholder": "e.g. 1623"})) areacode = forms.CharField(required=False, label="Area code", widget=forms.TextInput(attrs={"placeholder": "e.g. 1623"})) # should be required=True?
subarea = forms.CharField(required=False, label="Subarea (do not use for new caves)", widget=forms.TextInput(attrs={"placeholder": "usually blank, archaic"})) subarea = forms.CharField(required=False, label="Subarea (do not use for new caves)", widget=forms.TextInput(attrs={"placeholder": "usually blank, archaic"}))
#cave_slug = forms.CharField() #cave_slug = forms.CharField()
@@ -143,15 +143,9 @@ class CaveForm(ModelForm):
self._errors["unofficial_number"] = self.error_class( self._errors["unofficial_number"] = self.error_class(
["Either the kataster or unoffical number is required."] ["Either the kataster or unoffical number is required."]
) )
# if self.cleaned_data.get("kataster_number") != "" and self.cleaned_data.get("official_name") == "": if self.data.get("areacode") not in ["1623", "1626", "1627", "1624"]:
# self._errors["official_name"] = self.error_class(["This field is required when there is a kataster number."])
# if cleaned_data.get("url") == []:
# self._errors["url"] = self.error_class(["This field is required."])
# if cleaned_data.get("url") and cleaned_data.get("url").startswith("/"):
# self._errors["url"] = self.error_class(["This field cannot start with a /."])
if self.data.get("areacode") == "":
self._errors["areacode"] = self.error_class( self._errors["areacode"] = self.error_class(
["An areacode, e.g. 1623, is required."] ["An Austrian kataster areacode, i.e. 1623, 1626, 1627, or 1624 is required."]
) )
return cleaned_data return cleaned_data