summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_warehouse/models.py')
-rw-r--r--archaeological_warehouse/models.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index f89092dba..b32d608af 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -1290,13 +1290,14 @@ class Container(DocumentItem, Merge, LightHistorizedItem, QRCodeItem, GeoItem,
q = Container.objects
if q.count():
self.index = int(
- q.aggregate(Max("index"))["index__max"] or 0) + 1
+ q.all().aggregate(Max("index"))["index__max"] or 0) + 1
else:
self.index = 1
- elif self.responsible_id: # default is index by warehouse
- q = Container.objects.filter(responsible=self.responsible)
+ else: # default is index by warehouse
+ q = Container.objects.filter(location=self.location)
if q.count():
- self.index = int(q.aggregate(Max("index"))["index__max"]) + 1
+ self.index = int(
+ q.all().aggregate(Max("index"))["index__max"]) + 1
else:
self.index = 1