diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-09-12 23:16:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:18 +0100 |
| commit | 9718798bbf69f86a2c07742e8da61a7a83573639 (patch) | |
| tree | acb9cce5e8a47af7f32ab6092d1a83f8c0fabf3d /ishtar_common | |
| parent | a321a9da45e5fa4288a59a8a310a6e14e39ce702 (diff) | |
| download | Ishtar-9718798bbf69f86a2c07742e8da61a7a83573639.tar.bz2 Ishtar-9718798bbf69f86a2c07742e8da61a7a83573639.zip | |
Import GIS: default to 0 skip lines (for geopackage and SHP it must be 0)
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/forms_common.py | 8 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 2 |
2 files changed, 6 insertions, 4 deletions
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: diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 1d987c35c..087710fa7 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -1169,7 +1169,7 @@ class Import(models.Model): skip_lines = models.IntegerField( _("Skip lines"), default=1, - help_text=_("Number of header lines in your file (can be 0)."), + help_text=_("Number of header lines in your file (can be 0 and should be 0 for geopackage or Shapefile)."), ) error_file = models.FileField( _("Error file"), |