From cb758fec27e6805f16aec54520d2cac461fffccc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 9 Jan 2018 11:00:36 +0100 Subject: Fix index constraint for Container --- archaeological_warehouse/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'archaeological_warehouse/models.py') diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index bea55be9b..d6c33583f 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -305,7 +305,7 @@ class Container(LightHistorizedItem, ImageModel): verbose_name = _(u"Container") verbose_name_plural = _(u"Containers") ordering = ('cached_label',) - unique_together = ('index', 'location') + unique_together = ('index', 'responsible') permissions = ( ("view_container", u"Can view all Containers"), ("view_own_container", u"Can view own Container"), @@ -486,8 +486,8 @@ class Container(LightHistorizedItem, ImageModel): updated = False if not self.index: self.skip_history_when_saving = True - q = Container.objects.filter(responsible=self.responsible).order_by( - '-index') + q = Container.objects.filter(responsible=self.responsible).exclude( + pk=self.pk).order_by('-index') if q.count(): self.index = q.all()[0].index + 1 else: -- cgit v1.2.3