diff options
Diffstat (limited to 'ishtar/ishtar_base/models.py')
| -rw-r--r-- | ishtar/ishtar_base/models.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py index a41b17215..4fcb79186 100644 --- a/ishtar/ishtar_base/models.py +++ b/ishtar/ishtar_base/models.py @@ -762,7 +762,7 @@ class File(BaseHistorizedItem, OwnPerms): blank=True, null=True) permit_reference = models.CharField(_(u"Permit reference"), max_length=60, blank=True, null=True) - is_active = models.BooleanField(_(u"Is active?"), default=True) + end_date = models.DateField(_(u"Closing date"), null=True, blank=True) towns = models.ManyToManyField("Town", verbose_name=_(u"Towns"), related_name='file') creation_date = models.DateField(_(u"Creation date"), @@ -824,16 +824,19 @@ class File(BaseHistorizedItem, OwnPerms): @classmethod def get_query_owns(cls, user): - return Q(history_modifier=user) & Q(is_active=True) + return Q(history_modifier=user) & Q(end_date__isnull=True) + + def is_active(self): + return not bool(self.end_date) def closing(self): - if self.is_active: + if self.is_active(): return for item in self.history.all(): - if item.is_active(): + if not item.end_date: break - closing_item = item - return {'date':item.history_date, 'user':item.history_modifier} + return {'date':item.history_date, + 'user':IshtarUser.objects.get(pk=item.history_modifier_id)} def total_surface_ha(self): if self.total_surface: |