diff options
| -rw-r--r-- | ishtar_common/forms_common.py | 5 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 0f458ec51..495499425 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -341,7 +341,10 @@ class BaseImportForm(IshtarForm, forms.ModelForm): 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 + if hasattr(self.cleaned_data["importer_type"], "default_header_len"): + self.instance.skip_lines = self.cleaned_data["importer_type"].default_header_len + else: + self.instance.skip_lines = -1 return super().save(commit) diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 9045de0c2..5e29b98ed 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -1889,13 +1889,16 @@ class ImportGroup(BaseImport): for import_type_relation in self.importer_type.importer_types.all(): importer_type = import_type_relation.importer_type + skip_lines = self.skip_lines + if skip_lines == -1: # use default + skip_lines = importer_type.default_header_len imp = Import.objects.create( name=name, importer_type=importer_type, group=self, encoding=self.encoding, csv_sep=self.csv_sep, - skip_lines=self.skip_lines, + skip_lines=skip_lines, ) imports.append(imp) modified = False |