diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-12-29 08:17:30 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:23 +0100 |
| commit | 430eb478851d6b68bc2d2fe32a4a05bade552518 (patch) | |
| tree | 2eb55e450089956a4f9d7e29257c99009d1beadd | |
| parent | 014cf42986487a2ec70d68f741308d48ff88e486 (diff) | |
| download | Ishtar-430eb478851d6b68bc2d2fe32a4a05bade552518.tar.bz2 Ishtar-430eb478851d6b68bc2d2fe32a4a05bade552518.zip | |
Fix container merge (index error)
| -rw-r--r-- | archaeological_warehouse/models.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 017c39092..80774e31c 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -1321,7 +1321,10 @@ class Container(DocumentItem, Merge, LightHistorizedItem, return actions def pre_save(self): - if self.index: + q = Container.objects.filter(index=self.index, location=self.location) + if self.id: + q = q.exclude(id=self.id) + if self.index and not q.count(): return if settings.ISHTAR_CONTAINER_INDEX == "general": q = Container.objects |