diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-06-09 12:05:37 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
| commit | cbe8d22ccecad9e09dd70f5fdbbd78bf497671a9 (patch) | |
| tree | d59806d5799ac74b9134183fba5a0ecf8b762d65 /ishtar_common/models.py | |
| parent | 8d908f14a8cd15734a522c17c144efe06e21416a (diff) | |
| download | Ishtar-cbe8d22ccecad9e09dd70f5fdbbd78bf497671a9.tar.bz2 Ishtar-cbe8d22ccecad9e09dd70f5fdbbd78bf497671a9.zip | |
Fix container merge
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 9011c4638..a6cfcf697 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -4286,8 +4286,9 @@ class Merge(models.Model): for m in self.merge_exclusion.all(): m.delete() - def merge(self, item, keep_old=False): - merge_model_objects(self, item, keep_old=keep_old) + def merge(self, item, keep_old=False, exclude_fields=None): + merge_model_objects(self, item, keep_old=keep_old, + exclude_fields=exclude_fields) self.generate_merge_candidate() |