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 | 2dac896835dd74541c4960492119fd9c52c5a7a3 (patch) | |
| tree | 26d1d9321680b94b0d2cb66209f4eb5cc2c56227 /archaeological_warehouse/models.py | |
| parent | eb99d500e8e1d5b8be8f02ffdf8c4b505159add5 (diff) | |
| download | Ishtar-2dac896835dd74541c4960492119fd9c52c5a7a3.tar.bz2 Ishtar-2dac896835dd74541c4960492119fd9c52c5a7a3.zip | |
Containers: append warehouse to merge key (refs #4964)
Diffstat (limited to 'archaeological_warehouse/models.py')
| -rw-r--r-- | archaeological_warehouse/models.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 17719539b..d24985645 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -447,7 +447,6 @@ class WarehouseDivisionLink(models.Model): return self.warehouse.uuid, self.container_type.txt_idx - class ContainerTree(models.Model): CREATE_SQL = """ CREATE VIEW containers_tree AS @@ -765,7 +764,7 @@ class Container(DocumentItem, Merge, LightHistorizedItem, QRCodeItem, GeoItem, verbose_name=_("Main image"), blank=True, null=True) DISABLE_POLYGONS = False - MERGE_ATTRIBUTE = "get_cached_division" + MERGE_ATTRIBUTE = "get_merge_key" MERGE_STRING_FIELDS = ["old_reference"] class Meta: @@ -818,6 +817,10 @@ class Container(DocumentItem, Merge, LightHistorizedItem, QRCodeItem, GeoItem, def get_cached_division(self): return self._generate_cached_division() + @property + def get_merge_key(self): + return str(self.location.uuid) + "|" + self._generate_cached_division() + def _generate_cached_division(self): parents = [] parent = self.parent |