diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-04-10 16:34:33 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
| commit | 3176e8cecfbf8e0e4dbcff9d5f8c19f164198010 (patch) | |
| tree | 1a7567e73ab784209a74ede0481bfc2e21079748 /ishtar_common/models.py | |
| parent | 17b74b59e0a1def477be303340fd456c6e5e5c73 (diff) | |
| download | Ishtar-3176e8cecfbf8e0e4dbcff9d5f8c19f164198010.tar.bz2 Ishtar-3176e8cecfbf8e0e4dbcff9d5f8c19f164198010.zip | |
Fix merge candidate for containers
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 |