diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 03:46:34 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 03:46:34 +0200 |
| commit | b76052c0c76d2d8e42d93ad7ddbadcaafe06e0fc (patch) | |
| tree | a787e4b649bb245aeeabd8780f4b788ab80f0fef /ishtar_common/data_importer.py | |
| parent | 3a3945de8c1a46dad216237b7f7bc770d813d6ba (diff) | |
| parent | d7963807b49c45ff2910ec1fc2a0f732540db01b (diff) | |
| download | Ishtar-b76052c0c76d2d8e42d93ad7ddbadcaafe06e0fc.tar.bz2 Ishtar-b76052c0c76d2d8e42d93ad7ddbadcaafe06e0fc.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/data_importer.py
Diffstat (limited to 'ishtar_common/data_importer.py')
| -rw-r--r-- | ishtar_common/data_importer.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index d0f4805db..1cdb167bc 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -688,7 +688,8 @@ class Importer(object): data['history_modifier'] = self.history_modifier obj, created = self.get_object(self.OBJECT_CLS, data) - if self.import_instance and hasattr(obj, 'imports'): + if self.import_instance and hasattr(obj, 'imports') \ + and created: obj.imports.add(self.import_instance) if created: |