From 9fc9badd604c0ccdc1187d85721b50479dd21e09 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 24 Mar 2022 16:05:22 +0100 Subject: Fix import forms class --- ishtar_common/forms_common.py | 7 ++++--- ishtar_common/views.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 0490c1203..c3367eaac 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -159,9 +159,10 @@ class NewItemForm(forms.Form): self.fields[key].initial = [new_choices[0][0]] -class BaseImportForm(BSForm, forms.ModelForm): +class BaseImportForm(IshtarForm, forms.ModelForm): error_css_class = "error" required_css_class = "required" + importer_type = "gis" imported_images_link = forms.URLField( label=_("Associated images (web link to a zip file)"), required=False ) @@ -228,7 +229,7 @@ class BaseImportForm(BSForm, forms.ModelForm): return data -class NewImportForm(NewImportFormBase): +class NewImportForm(BaseImportForm): imported_images_link = forms.URLField( label=_("Associated images (web link to a zip file)"), required=False ) @@ -321,7 +322,7 @@ class NewImportForm(NewImportFormBase): return item -class NewImportGISForm(NewImportFormBase): +class NewImportGISForm(BaseImportForm): error_css_class = "error" required_css_class = "required" importer_type = "gis" diff --git a/ishtar_common/views.py b/ishtar_common/views.py index cb5addc52..f229ffdbd 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1377,7 +1377,7 @@ class GlobalVarEdit(IshtarMixin, AdminLoginRequiredMixin, ModelFormSetView): class NewImportView(IshtarMixin, LoginRequiredMixin, CreateView): template_name = "ishtar/form.html" model = models.Import - form_class = forms.BaseImportForm + form_class = forms.NewImportForm page_name = _("Import: create (table)") def get_success_url(self): @@ -1397,7 +1397,7 @@ class NewImportView(IshtarMixin, LoginRequiredMixin, CreateView): class EditImportView(IshtarMixin, LoginRequiredMixin, UpdateView): template_name = "ishtar/form.html" model = models.Import - form_class = forms.BaseImportForm + form_class = forms.NewImportForm page_name = _("Edit import") def get_success_url(self): -- cgit v1.2.3