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 | 7be19ec387e86dc08074b0b9728c3b0819d10053 (patch) | |
tree | a787e4b649bb245aeeabd8780f4b788ab80f0fef | |
parent | 4be6105527447d6a5f1d6260fdc21132749130a6 (diff) | |
parent | beefa1c57af2dae4f77304de653b54ddbdc88df5 (diff) | |
download | Ishtar-7be19ec387e86dc08074b0b9728c3b0819d10053.tar.bz2 Ishtar-7be19ec387e86dc08074b0b9728c3b0819d10053.zip |
Merge branch 'stable'
Conflicts:
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: |