diff options
Diffstat (limited to 'archaeological_warehouse/models.py')
| -rw-r--r-- | archaeological_warehouse/models.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index c6146e3a7..e4b24e2e7 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -144,6 +144,7 @@ class Container(LightHistorizedItem): 'reference': 'reference__icontains', } SHOW_URL = 'show-container' + CACHED_LABELS = ['cached_label', 'cached_location'] # fields location = models.ForeignKey(Warehouse, verbose_name=_(u"Warehouse"), @@ -154,6 +155,9 @@ class Container(LightHistorizedItem): comment = models.TextField(_(u"Comment")) cached_label = models.CharField(_(u"Cached name"), max_length=500, null=True, blank=True) + cached_location = models.CharField(_(u"Cached location"), max_length=500, + null=True, blank=True) + index = models.IntegerField(u"Index", default=1) class Meta: verbose_name = _(u"Container") @@ -162,7 +166,7 @@ class Container(LightHistorizedItem): def __unicode__(self): lbl = u" - ".join((self.reference, unicode(self.container_type), - unicode(self.location))) + unicode(self.index), unicode(self.location))) return lbl def _generate_cached_label(self): @@ -170,6 +174,11 @@ class Container(LightHistorizedItem): cached_label = u" | ".join(items) return cached_label + def _generate_cached_location(self): + items = [self.location, self.index] + cached_label = u" - ".join(items) + return cached_label + @property def associated_filename(self): return datetime.date.today().strftime('%Y-%m-%d') + '-' + \ |