From 69cf0a7de4b4d842c814e83f28f7d45aec69929c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 10 Apr 2020 16:34:33 +0200 Subject: Fix merge candidate for containers --- ishtar_common/models.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ishtar_common') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 071b05598..9011c4638 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -4228,6 +4228,7 @@ class Merge(models.Model): # 1 for one word similarity, 2 for two word similarity, etc. MERGE_CLEMENCY = None EMPTY_MERGE_KEY = '--' + MERGE_ATTRIBUTE = "name" class Meta: abstract = True @@ -4235,7 +4236,8 @@ class Merge(models.Model): def generate_merge_key(self): if self.archived: return - self.merge_key = slugify(self.name if self.name else '') + merge_attr = getattr(self, self.MERGE_ATTRIBUTE) + self.merge_key = slugify(merge_attr if merge_attr else '') if not self.merge_key: self.merge_key = self.EMPTY_MERGE_KEY self.merge_key = self.merge_key -- cgit v1.2.3