From 2f526ba22f183ef744cfd7ac7284585f8b318d95 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 7 Oct 2024 17:12:17 +0200 Subject: ✨ Importer type: add default number of line to skip for CSV - 🗃️ DB: export types for templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/forms_common.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ishtar_common/forms_common.py') diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 479d98315..ce4bc140b 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -246,6 +246,8 @@ class BaseImportForm(IshtarForm, forms.ModelForm): user = kwargs.pop("user") super().__init__(*args, **kwargs) self.fields["imported_file"].required = True + self.fields["skip_lines"].required = False + self.fields["skip_lines"].initial = None self._filter_group(user) self._filter_importer_type(user) if "imported_images" in self.fields: @@ -413,6 +415,8 @@ class NewImportForm(BaseImportForm): def save(self, user, commit=True): self.instance.user = user + if not self.cleaned_data["skip_lines"]: + self.instance.skip_lines = self.cleaned_data["importer_type"].default_header_len item = super().save(commit) if not self.media_link_is_zip: return item @@ -451,10 +455,6 @@ class NewImportGISForm(BaseImportForm): "encoding": FormHeader(_("CSV options")), } - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.fields["skip_lines"].initial = 0 - def clean_imported_file(self): value = self.cleaned_data.get("imported_file", None) if value: -- cgit v1.2.3