diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-04-05 15:45:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-04-05 15:45:26 +0200 |
| commit | cb81ce310c580dfdb804e39b4b145296737d22b4 (patch) | |
| tree | 3ef5273826560c4082dc2e40fddc14810137b5f8 /ishtar_common/model_merging.py | |
| parent | dff0db2127ba254ed06edf8799f08bbe6048e317 (diff) | |
| download | Ishtar-cb81ce310c580dfdb804e39b4b145296737d22b4.tar.bz2 Ishtar-cb81ce310c580dfdb804e39b4b145296737d22b4.zip | |
Merge: generic function for main items - adpat for containers
Diffstat (limited to 'ishtar_common/model_merging.py')
| -rw-r--r-- | ishtar_common/model_merging.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ishtar_common/model_merging.py b/ishtar_common/model_merging.py index c8e2bc6bf..188ec42dd 100644 --- a/ishtar_common/model_merging.py +++ b/ishtar_common/model_merging.py @@ -20,7 +20,7 @@ def get_models(): @transaction.atomic -def merge_model_objects(primary_object, alias_objects=[], keep_old=False): +def merge_model_objects(primary_object, alias_objects, keep_old=False): """ Use this function to merge model objects (i.e. Users, Organizations, etc.) and migrate all of the related fields from the alias objects to the @@ -154,5 +154,6 @@ def merge_model_objects(primary_object, alias_objects=[], keep_old=False): if not keep_old: alias_object.delete() + primary_object.skip_history_when_saving = True primary_object.save() return primary_object |