diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-03-18 15:03:39 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-07-08 09:58:50 +0200 |
| commit | eb22ce30586cc3aa6c37044485eae570296c01b2 (patch) | |
| tree | 9f1513517bff9191895b8d0466e89938b55cf8fd | |
| parent | 910b6a68551ee85e185db7ceca8420cb1dd35646 (diff) | |
| download | Ishtar-eb22ce30586cc3aa6c37044485eae570296c01b2.tar.bz2 Ishtar-eb22ce30586cc3aa6c37044485eae570296c01b2.zip | |
Refactoring: NewImportForm -> BaseImportForm
| -rw-r--r-- | archaeological_finds/tests.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 8 | ||||
| -rw-r--r-- | ishtar_common/forms_common.py | 6 | ||||
| -rw-r--r-- | ishtar_common/views.py | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index d198d93ee..0949972b3 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -661,7 +661,7 @@ class ImportFindTest(ImportTest, FindInit, TestCase): "name": "init_find_import", "csv_sep": ",", } - form = forms_common.NewImportForm( + form = forms_common.BaseImportForm( data=post_dict, files=file_dict, user=self.user ) form.is_valid() @@ -801,7 +801,7 @@ class ImportFindTest(ImportTest, FindInit, TestCase): "name": "init_find_import", "csv_sep": ",", } - form = forms_common.NewImportForm( + form = forms_common.BaseImportForm( data=post_dict, files=file_dict, user=self.user ) form.is_valid() diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 843743852..e7cbe670c 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -182,7 +182,7 @@ class ImportTest(object): "associated_group": group.pk, "csv_sep": sep, } - form = forms_common.NewImportForm( + form = forms_common.BaseImportForm( data=post_dict, files=file_dict, user=self.user ) form.is_valid() @@ -288,7 +288,7 @@ class ImportTest(object): "name": "init_parcel_import", "csv_sep": ",", } - form = forms_common.NewImportForm( + form = forms_common.BaseImportForm( data=post_dict, files=file_dict, user=self.user ) form.is_valid() @@ -318,7 +318,7 @@ class ImportTest(object): "name": "init_context_record_import", "csv_sep": ",", } - form = forms_common.NewImportForm( + form = forms_common.BaseImportForm( data=post_dict, files=file_dict, user=self.user ) form.is_valid() @@ -760,7 +760,7 @@ class ImportDocumentTest(ImportTest, TestCase): "associated_group": group.pk, "csv_sep": ",", } - form = forms_common.NewImportForm( + form = forms_common.BaseImportForm( data=post_dict, files=file_dict, user=self.user ) form.is_valid() 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): |