diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-04-25 17:20:43 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:21:00 +0100 |
| commit | 810d6074789e3e6b11854f676314972a6952b486 (patch) | |
| tree | 1c72fe0fdb13eaaf83b710c679923b6049eaab99 /ishtar_common | |
| parent | 8fb573b0c06298196689a813aeb0b69646d70e0d (diff) | |
| download | Ishtar-810d6074789e3e6b11854f676314972a6952b486.tar.bz2 Ishtar-810d6074789e3e6b11854f676314972a6952b486.zip | |
Geodata: test shp import - fix table import
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/data_importer.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 1c99782e3..0616e2a10 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -1028,7 +1028,7 @@ class Importer(object): self.history_modifier = history_modifier self.output = output if not self.history_modifier: - if self.import_instance: + if self.import_instance and self.import_instance.user: self.history_modifier = self.import_instance.user.user_ptr else: # import made by the CLI: get the first admin diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index b8c842284..aab404b63 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -1539,7 +1539,7 @@ class Import(models.Model): @property def data_table(self): if self.importer_type.type == "tab": - return self._data_table_tab(), None + return self._data_table_tab() if self.importer_type.type == "gis": return self._data_table_gis() |