diff options
Diffstat (limited to 'archaeological_finds/models_treatments.py')
| -rw-r--r-- | archaeological_finds/models_treatments.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 0f4a53afc..b8ed79a62 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -104,7 +104,7 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): treatment_types = models.ManyToManyField( TreatmentType, verbose_name=_(u"Treatment type")) treatment_state = models.ForeignKey( - TreatmentState, verbose_name=_(u"State"), blank=True, null=True, + TreatmentState, verbose_name=_(u"State"), blank=True, null=True, ) location = models.ForeignKey( Warehouse, verbose_name=_(u"Location"), blank=True, null=True, @@ -126,7 +126,8 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): end_date = models.DateField(_(u"Closing date"), blank=True, null=True) container = models.ForeignKey(Container, verbose_name=_(u"Container"), blank=True, null=True) - target_is_basket = models.BooleanField(_(u"Target a basket"), default=False) + target_is_basket = models.BooleanField(_(u"Target a basket"), + default=False) cached_label = models.TextField(_(u"Cached name"), null=True, blank=True) history = HistoricalRecords() @@ -157,7 +158,7 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): def get_query_owns(cls, user): return (Q(history_creator=user) | Q(person__ishtaruser=user.ishtaruser)) \ - & Q(end_date__isnull=True) + & Q(end_date__isnull=True) @classmethod def get_owns(cls, user, menu_filtr=None, limit=None): @@ -239,7 +240,7 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): @property def associated_filename(self): return "-".join([str(slugify(getattr(self, attr))) - for attr in ('year', 'index', 'label')]) + for attr in ('year', 'index', 'label')]) post_save.connect(cached_label_changed, sender=Treatment) @@ -429,7 +430,7 @@ post_delete.connect(post_save_cache, sender=TreatmentFileType) class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, - ShortMenuItem): + ShortMenuItem): SLUG = 'treatmentfile' SHOW_URL = 'show-treatmentfile' TABLE_COLS = ['type', 'year', 'index', 'internal_reference', 'name'] @@ -444,8 +445,8 @@ class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, external_id = models.CharField(_(u"External ID"), blank=True, null=True, max_length=200) name = models.TextField(_(u"Name"), blank=True, null=True) - type = models.ForeignKey(TreatmentFileType, verbose_name=_(u"Treatment " - u"request type")) + type = models.ForeignKey(TreatmentFileType, + verbose_name=_(u"Treatment request type")) in_charge = models.ForeignKey( Person, related_name='treatmentfile_responsability', verbose_name=_(u"Person in charge"), on_delete=models.SET_NULL, @@ -473,15 +474,15 @@ class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, verbose_name_plural = _(u"Treatment requests") unique_together = ('year', 'index') permissions = ( - ("view_filetreatement", + ("view_filetreatment", ugettext(u"Can view all Treatment requests")), - ("view_own_filetreatement", + ("view_own_filetreatment", ugettext(u"Can view own Treatment request")), - ("add_own_filetreatement", + ("add_own_filetreatment", ugettext(u"Can add own Treatment request")), - ("change_own_filetreatement", + ("change_own_filetreatment", ugettext(u"Can change own Treatment request")), - ("delete_own_filetreatement", + ("delete_own_filetreatment", ugettext(u"Can delete own Treatment request")), ) ordering = ('cached_label',) @@ -497,7 +498,7 @@ class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, def get_query_owns(cls, user): return (Q(history_creator=user) | Q(in_charge__ishtaruser=user.ishtaruser)) \ - & Q(end_date__isnull=True) + & Q(end_date__isnull=True) @property def associated_filename(self): |