summaryrefslogtreecommitdiff
path: root/archaeological_operations/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2014-06-15 19:46:25 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2014-06-15 19:46:25 +0200
commit42e670964c037cf9edf11b3fa12c6ab6465362da (patch)
tree14fd19cba5728d93dccdee96daf84aaf5309de1b /archaeological_operations/models.py
parent1dce12d7a7c1a7db7a0b467b09248b3b8d2e3724 (diff)
downloadIshtar-42e670964c037cf9edf11b3fa12c6ab6465362da.tar.bz2
Ishtar-42e670964c037cf9edf11b3fa12c6ab6465362da.zip
Administrativ act: fix bad index
Diffstat (limited to 'archaeological_operations/models.py')
-rw-r--r--archaeological_operations/models.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 8601c602f..2ea29fcf5 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -590,15 +590,14 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
if q.count():
c_index = q.all()[0].index + 1
self.index = c_index
- if self.act_type.indexed:
- conflict = AdministrativeAct.objects.filter(act_type__indexed=True,
- signature_date__year=year,
- index=self.index)
- if self.pk:
- conflict = conflict.exclude(pk=self.pk)
- if conflict.count():
- raise ValidationError(_(u"This index already exists for "
- u"this year"))
+ conflict = AdministrativeAct.objects.filter(act_type__indexed=True,
+ signature_date__year=year,
+ index=self.index)
+ if self.pk:
+ conflict = conflict.exclude(pk=self.pk)
+ if conflict.count():
+ raise ValidationError(_(u"This index already exists for "
+ u"this year"))
super(AdministrativeAct, self).save(*args, **kwargs)
class Parcel(LightHistorizedItem):