summaryrefslogtreecommitdiff
path: root/ishtar_common/models_imports.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-19 11:37:42 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-19 11:37:42 +0200
commit782b857248435767cc4868a472ce27211596614a (patch)
tree8b0099c79567f3aa32a222a1ecbf6fd17e686b9a /ishtar_common/models_imports.py
parent37ad2699ac330364895d58a5fcbf4300998f370c (diff)
downloadIshtar-782b857248435767cc4868a472ce27211596614a.tar.bz2
Ishtar-782b857248435767cc4868a472ce27211596614a.zip
Importers: fix user target key management (refs #3725)
Diffstat (limited to 'ishtar_common/models_imports.py')
-rw-r--r--ishtar_common/models_imports.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index ccb0f2c57..d82d0580f 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -584,7 +584,14 @@ class TargetKey(models.Model):
except self.target.associated_model.DoesNotExist:
pass
if v:
- v.add_key(self.key, importer=self.associated_import)
+ keys = {}
+ if self.associated_group:
+ keys['group'] = self.associated_group
+ if self.associated_user:
+ keys['user'] = self.associated_user
+ else:
+ keys['importer'] = self.associated_import
+ v.add_key(self.key, **keys)
return obj
TARGET_MODELS = [