diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-05 11:36:09 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-05 11:36:09 +0200 |
| commit | a5ea65e3410dc8ac5f47721b2b102f8966fe4efa (patch) | |
| tree | eea2dc10ead05e031a02cbd8c78618ce15c6979e | |
| parent | 7b5023076c539c46cfaf80ad5c60f062eda87897 (diff) | |
| download | Ishtar-a5ea65e3410dc8ac5f47721b2b102f8966fe4efa.tar.bz2 Ishtar-a5ea65e3410dc8ac5f47721b2b102f8966fe4efa.zip | |
Imports: pass user to import in order to match with associated target keys
| -rw-r--r-- | ishtar_common/data_importer.py | 6 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index a9a151434..00aa34f4c 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -919,9 +919,11 @@ class Importer(object): import_instance=self.import_instance, user=user) - def importation(self, table, initialize=True, choose_default=False): + def importation(self, table, initialize=True, choose_default=False, + user=None): if initialize: - self.initialize(table, self.output, choose_default=choose_default) + self.initialize(table, self.output, + choose_default=choose_default, user=user) self._importation(table) def _associate_db_target_to_formaters(self): diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index a6fcd89c6..3c62bb53d 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -893,7 +893,7 @@ class Import(models.Model): self.state = 'IP' self.save() importer = self.get_importer_instance() - importer.importation(self.data_table) + importer.importation(self.data_table, user=self.user) # result file filename = slugify(self.importer_type.name) now = datetime.datetime.now().isoformat('-').replace(':', '') |