diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-08-31 18:11:40 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
| commit | 735be2a425636b7dc49f71c650e1765a527a3e97 (patch) | |
| tree | 26d1d9321680b94b0d2cb66209f4eb5cc2c56227 /ishtar_common | |
| parent | dcd1225cef0fc3e573a11cec651e16f2b35b83cf (diff) | |
| download | Ishtar-735be2a425636b7dc49f71c650e1765a527a3e97.tar.bz2 Ishtar-735be2a425636b7dc49f71c650e1765a527a3e97.zip | |
Containers: append warehouse to merge key (refs #4964)
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/models.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 08ae93fa6..04ed6d6c0 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -4278,16 +4278,15 @@ class Merge(models.Model): self.generate_merge_key() item = super(Merge, self).save(*args, **kwargs) if not merge_key_generated: + self.merge_candidate.clear() self.generate_merge_candidate() return item def archive(self): self.archived = True self.save() - for m in self.merge_candidate.all(): - m.delete() - for m in self.merge_exclusion.all(): - m.delete() + self.merge_candidate.clear() + self.merge_exclusion.clear() def merge(self, item, keep_old=False, exclude_fields=None): merge_model_objects(self, item, keep_old=keep_old, |