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 | 141044c1f2ee310770de89fbbbfad1cae4ef857e (patch) | |
| tree | 1c72fe0fdb13eaaf83b710c679923b6049eaab99 | |
| parent | 390c17123f51a2face7eac47c974b6083e9b0664 (diff) | |
| download | Ishtar-141044c1f2ee310770de89fbbbfad1cae4ef857e.tar.bz2 Ishtar-141044c1f2ee310770de89fbbbfad1cae4ef857e.zip | |
Geodata: test shp import - fix table import
| -rw-r--r-- | archaeological_context_records/tests.py | 11 | ||||
| -rw-r--r-- | archaeological_context_records/tests/UE-test-shp.zip | bin | 0 -> 3733 bytes | |||
| -rw-r--r-- | ishtar_common/data_importer.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index 5b839986e..acebda49b 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -78,12 +78,18 @@ if settings.SELENIUM_TEST: class ImportContextRecordTest(ImportTest, TestCase): fixtures = CONTEXT_RECORD_TOWNS_FIXTURES - def test_geo_import(self): + def test_geo_import_gpkg(self): + self._test_geo_import("UE-test-gpkg.zip", 9) + + def test_geo_import_shp(self): + self._test_geo_import("UE-test-shp.zip", 12) + + def _test_geo_import(self, data_name, new_nb): root = settings.ROOT_PATH + "../archaeological_context_records/tests/" filename = root + "importer-GIS-UE.zip" self.restore_serialized(filename) imp_type = ImporterType.objects.get(name="GIS - UE") - imp_file = open(root + "UE-test-gpkg.zip", "rb") + imp_file = open(root + data_name, "rb") file_dict = { "imported_file": SimpleUploadedFile(imp_file.name, imp_file.read()) } @@ -102,7 +108,6 @@ class ImportContextRecordTest(ImportTest, TestCase): code_patriarche="184440", operation_type=models_ope.OperationType.objects.all()[0]) impt.importation() - new_nb = 9 self.assertEqual(models.ContextRecord.objects.count() - nb, new_nb) new = models.ContextRecord.objects.order_by("-pk").all()[:new_nb] for cr in new: diff --git a/archaeological_context_records/tests/UE-test-shp.zip b/archaeological_context_records/tests/UE-test-shp.zip Binary files differnew file mode 100644 index 000000000..1bfb7db0a --- /dev/null +++ b/archaeological_context_records/tests/UE-test-shp.zip 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() |