diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-04-08 18:06:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
| commit | 721cf51b30ed646f2073bc56aaf62ff1878aef94 (patch) | |
| tree | 47c2df9adb1820c3993f1e50743dafcf86262e15 /ishtar_common/models.py | |
| parent | 5c0a4d451ec653d76ae26c444da8c000460c9db6 (diff) | |
| download | Ishtar-721cf51b30ed646f2073bc56aaf62ff1878aef94.tar.bz2 Ishtar-721cf51b30ed646f2073bc56aaf62ff1878aef94.zip | |
New container management - merge action
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
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() |