diff options
Diffstat (limited to 'core/forms.py')
| -rw-r--r-- | core/forms.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/core/forms.py b/core/forms.py index a2ea45b..f6fdda6 100644 --- a/core/forms.py +++ b/core/forms.py @@ -61,12 +61,12 @@ class CaveForm(ModelForm): survex_file = forms.CharField( required=False, label="Survex file eg. caves-1623/000/000.svx", widget=forms.TextInput(attrs={"size": "45"}) ) - url = forms.CharField(required=True, label="URL eg. 1623/000/000 (no .html)", widget=forms.TextInput(attrs={"size": "45"})) + #url = forms.CharField(required=True, label="URL eg. 1623/000/000 (no .html)", widget=forms.TextInput(attrs={"size": "45"})) length = forms.CharField(required=False, label="Length (m)") depth = forms.CharField(required=False, label="Depth (m)") extent = forms.CharField(required=False, label="Extent (m)") - cave_slug = forms.CharField(widget = forms.HiddenInput(), required = False) + #cave_slug = forms.CharField() class Meta: model = Cave @@ -74,8 +74,12 @@ class CaveForm(ModelForm): field_order = ['area', 'unofficial_number', 'kataster_number', 'official_name', 'underground_description', 'explorers', 'equipment', 'survey', 'kataster_status', 'underground_centre_line', 'notes', 'references', 'description_file', 'survex_file', 'url', 'length', 'depth', 'extent'] + def get_area(self): + for a in self.cleaned_data["area"]: + if a.kat_area(): + return a.kat_area() + def clean_cave_slug(self): - print(self.cleaned_data["cave_slug"] == "") if self.cleaned_data["cave_slug"] == "": myArea = "" for a in self.cleaned_data["area"]: @@ -91,11 +95,11 @@ class CaveForm(ModelForm): print("EEE", cave_slug.replace("-PENDING-", "-")) return cave_slug.replace("-PENDING-", "-") - def clean_url(self): - data = self.cleaned_data["url"] - if not re.match("\d\d\d\d/.", data): - raise ValidationError("URL must start with a four digit Kataster area.") - return data +# def clean_url(self): +# data = self.cleaned_data["url"] +# if not re.match("\d\d\d\d/.", data): +# raise ValidationError("URL must start with a four digit Kataster area.") +# return data def clean(self): |