diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-09 11:01:14 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-09 11:01:14 +0100 |
| commit | 148b132a03bcc8031b1edfac5810b6aeb890fa8b (patch) | |
| tree | dd9df834f2b502ee883a6881ffdfd470205a6a24 /archaeological_warehouse/models.py | |
| parent | 050e801e1096682b5e4efe1a990109eda582dce5 (diff) | |
| parent | 62f73b8142e180eafc698f5e3196514b9ff61f0b (diff) | |
| download | Ishtar-148b132a03bcc8031b1edfac5810b6aeb890fa8b.tar.bz2 Ishtar-148b132a03bcc8031b1edfac5810b6aeb890fa8b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_warehouse/models.py')
| -rw-r--r-- | archaeological_warehouse/models.py | 6 |
1 files changed, 3 insertions, 3 deletions
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: |