From 9718798bbf69f86a2c07742e8da61a7a83573639 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 12 Sep 2022 23:16:22 +0200 Subject: Import GIS: default to 0 skip lines (for geopackage and SHP it must be 0) --- ishtar_common/forms_common.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ishtar_common/forms_common.py') diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 26752149e..1b09bf53c 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -180,7 +180,6 @@ class BaseImportForm(IshtarForm, forms.ModelForm): "imported_images", "imported_images_link", "associated_group", - "conservative_import", "skip_lines", ) widgets = { @@ -218,7 +217,6 @@ class BaseImportForm(IshtarForm, forms.ModelForm): def _clean_csv(self, is_csv=False): imported_file = self.cleaned_data.get("imported_file", None) encoding = self.cleaned_data.get("encoding", None) - print(encoding) if imported_file and encoding: try: if not imported_file.name.lower().endswith(".csv"): @@ -268,7 +266,6 @@ class NewImportForm(BaseImportForm): "imported_images", "imported_images_link", "associated_group", - "conservative_import", "skip_lines", ) @@ -343,12 +340,17 @@ class NewImportGISForm(BaseImportForm): "encoding", "csv_sep", "associated_group", + "skip_lines", ) HEADERS = { "name": FormHeader(_("Import (GIS)")), } + 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