From 721cf51b30ed646f2073bc56aaf62ff1878aef94 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 8 Apr 2020 18:06:26 +0200 Subject: New container management - merge action --- ishtar_common/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 38e5b2fb4..071b05598 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -4284,8 +4284,8 @@ class Merge(models.Model): for m in self.merge_exclusion.all(): m.delete() - def merge(self, item): - merge_model_objects(self, item) + def merge(self, item, keep_old=False): + merge_model_objects(self, item, keep_old=keep_old) self.generate_merge_candidate() -- cgit v1.2.3