From d9f08efb2e5cd65e50bcb10c2863a4e445f17e2c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 5 Apr 2019 15:45:26 +0200 Subject: Merge: generic function for main items - adpat for containers --- ishtar_common/model_merging.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ishtar_common/model_merging.py') 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 -- cgit v1.2.3