From dbf816d8df8ea972827209c2f53f9f3267e73653 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 18 Mar 2022 15:03:39 +0100 Subject: Refactoring: NewImportForm -> BaseImportForm --- ishtar_common/forms_common.py | 6 +++--- ishtar_common/views.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index b2d31c5f3..80fb984c6 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -155,7 +155,7 @@ class NewItemForm(forms.Form): self.fields[key].initial = [new_choices[0][0]] -class NewImportForm(BSForm, forms.ModelForm): +class BaseImportForm(BSForm, forms.ModelForm): error_css_class = "error" required_css_class = "required" imported_images_link = forms.URLField( @@ -179,7 +179,7 @@ class NewImportForm(BSForm, forms.ModelForm): def __init__(self, *args, **kwargs): user = kwargs.pop("user") - super(NewImportForm, self).__init__(*args, **kwargs) + super(BaseImportForm, self).__init__(*args, **kwargs) groups = models.TargetKeyGroup.objects.filter(available=True) if not user.is_superuser: groups = groups.filter(all_user_can_use=True) @@ -237,7 +237,7 @@ class NewImportForm(BSForm, forms.ModelForm): if "imported_images_link" in self.cleaned_data else None ) - item = super(NewImportForm, self).save(commit) + item = super(BaseImportForm, self).save(commit) if not imported_images_link: return item request = requests.get(imported_images_link, stream=True) diff --git a/ishtar_common/views.py b/ishtar_common/views.py index ce27ce0e7..2dc42041f 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.NewImportForm + form_class = forms.BaseImportForm page_name = _("New import") 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.NewImportForm + form_class = forms.BaseImportForm page_name = _("Edit import") def get_success_url(self): -- cgit v1.2.3