diff options
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 7491f5704..943995e0b 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1110,8 +1110,7 @@ class Address(BaseHistorizedItem): class Merge(models.Model): - merge_key = models.CharField(_("Merge key"), max_length=300, - blank=True, null=True) + merge_key = models.TextField(_("Merge key"), blank=True, null=True) merge_candidate = models.ManyToManyField("self", blank=True, null=True) merge_exclusion = models.ManyToManyField("self", @@ -1124,10 +1123,10 @@ class Merge(models.Model): abstract = True def generate_merge_key(self): - self.merge_key = slugify(self.name if self.name else '')[:300] + self.merge_key = slugify(self.name if self.name else '') if not self.merge_key: self.merge_key = self.EMPTY_MERGE_KEY - self.merge_key = self.merge_key[:300] + self.merge_key = self.merge_key def generate_merge_candidate(self): if not self.merge_key: @@ -1917,7 +1916,8 @@ class Organization(Address, Merge, OwnPerms, ValueGetter): self.merge_key = self.EMPTY_MERGE_KEY if self.town: self.merge_key += "-" + slugify(self.town or '') - self.merge_key = self.merge_key[:300] + if self.address: + self.merge_key += "-" + slugify(self.address or '') @property def associated_filename(self): @@ -2023,7 +2023,6 @@ class Person(Address, Merge, OwnPerms, ValueGetter): self.merge_key = self.EMPTY_MERGE_KEY if self.merge_key != self.EMPTY_MERGE_KEY and self.attached_to: self.merge_key += "-" + self.attached_to.merge_key - self.merge_key = self.merge_key[:300] def is_natural(self): return not self.attached_to |