From 430eb478851d6b68bc2d2fe32a4a05bade552518 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 29 Dec 2020 08:17:30 +0100
Subject: Fix container merge (index error)

---
 archaeological_warehouse/models.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'archaeological_warehouse/models.py')

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
-- 
cgit v1.2.3