diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-11-30 18:22:18 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-02-05 10:51:52 +0100 |
| commit | 40ccc85954728bb852d165c13319d1b471668a82 (patch) | |
| tree | 6911f67b84e93971b030a42186fdcfa04f073718 /ishtar_common/forms_common.py | |
| parent | 117ff7ad50fbd0a5ce99d18e1fd1615ae4e1a600 (diff) | |
| download | Ishtar-40ccc85954728bb852d165c13319d1b471668a82.tar.bz2 Ishtar-40ccc85954728bb852d165c13319d1b471668a82.zip | |
🐛 GIS imports - allow XLS and ODS format (refs #5669)
Diffstat (limited to 'ishtar_common/forms_common.py')
| -rw-r--r-- | ishtar_common/forms_common.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 4065e1fa3..7ca808929 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -462,7 +462,7 @@ class NewImportGISForm(BaseImportForm): if value: try: ext = value.name.lower().split(".")[-1] - if ext not in ("zip", "gpkg", "csv"): + if ext not in ["zip", "gpkg", "csv", "ods", "xls", "xlsx", "xlsm"]: raise forms.ValidationError("") if ext == "zip": zip_file = zipfile.ZipFile(value) @@ -479,16 +479,14 @@ class NewImportGISForm(BaseImportForm): except forms.ValidationError: raise forms.ValidationError( _( - "GIS file must be a zip containing a ShapeFile or GeoPackage file." + "GIS file must be a table or a zip containing a ShapeFile or GeoPackage file." ) ) return value def clean(self): data = super().clean() - types = ["zip", "gpkg", "csv"] - if settings.USE_LIBREOFFICE: - types += [".ods", ".xls", ".xlsx", ".xlsm"] + types = [".zip", ".gpkg", ".csv", ".ods", ".xls", ".xlsx", ".xlsm"] self._clean_imported_file(types=types) return data |