diff options
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 64c76822d..f0e58bb9f 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -317,6 +317,10 @@ class File(BaseHistorizedItem, OwnPerms): if getattr(self, k)] return u" - ".join(items) + @classmethod + def get_query_owns(cls, user): + return Q(history_modifier=user) + class OperationType(GeneralType): class Meta: verbose_name = _(u"Operation type") @@ -338,8 +342,8 @@ class Operation(BaseHistorizedItem, OwnPerms): verbose_name=_(u"File")) operation_type = models.ForeignKey(OperationType, related_name='+', verbose_name=_(u"Operation type")) - remains = models.ManyToManyField("RemainType") - towns = models.ManyToManyField("Town") + remains = models.ManyToManyField("RemainType", verbose_name=_(u'Remains')) + towns = models.ManyToManyField("Town", verbose_name=_(u"Towns")) if settings.COUNTRY == 'fr': code_patriarche = models.IntegerField(u"Code PATRIARCHE", null=True, blank=True) @@ -372,16 +376,9 @@ class Operation(BaseHistorizedItem, OwnPerms): @classmethod def get_query_owns(cls, user): - return Q(in_charge=user.person)|Q(history_modifier=user) + return Q(in_charge=user.person)|Q(history_modifier=user)\ + & Q(end_date__isnull=True) - """ - @classmethod - def get_owns(cls, user, order_by=['-year', '-operation_code']): - if user.is_anonymous(): - return [] - return cls.objects.filter(history_modifier=user).order_by(*order_by - ).all() -""" class Parcel(LightHistorizedItem): associated_file = models.ForeignKey(File, related_name='parcels', blank=True, null=True, verbose_name=_(u"File")) |