diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-31 16:01:19 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-31 16:01:19 +0100 |
| commit | 8f13e1e7b9bd1ff8f7367e568f2bb2ba234a7f33 (patch) | |
| tree | 4e1064444b5711e72648019e15e74de721b730c4 /archaeological_warehouse/models.py | |
| parent | 9c94fdd38c92e349ee299270226a2adc5e68f97b (diff) | |
| parent | 818a23a3d064c2216759e0d0f239a6c4fff1069f (diff) | |
| download | Ishtar-8f13e1e7b9bd1ff8f7367e568f2bb2ba234a7f33.tar.bz2 Ishtar-8f13e1e7b9bd1ff8f7367e568f2bb2ba234a7f33.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_warehouse/models.py')
| -rw-r--r-- | archaeological_warehouse/models.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index d6c33583f..6ea5a7d10 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -259,7 +259,7 @@ post_delete.connect(post_save_cache, sender=ContainerType) class Container(LightHistorizedItem, ImageModel): TABLE_COLS = ['reference', 'container_type__label', 'cached_location', - 'divisions_lbl'] + 'divisions_lbl', 'old_reference'] IMAGE_PREFIX = 'containers/' # search parameters @@ -267,6 +267,7 @@ class Container(LightHistorizedItem, ImageModel): 'location': 'location__pk', 'container_type': 'container_type__pk', 'reference': 'reference__icontains', + 'old_reference': 'old_reference__icontains', 'finds__base_finds__context_record__operation': 'finds__base_finds__context_record__operation', 'finds__base_finds__context_record': @@ -290,13 +291,15 @@ class Container(LightHistorizedItem, ImageModel): related_name='owned_containers') container_type = models.ForeignKey(ContainerType, verbose_name=_("Container type")) - reference = models.CharField(_(u"Container ref."), max_length=40) + reference = models.CharField(_(u"Container ref."), max_length=200) comment = models.TextField(_(u"Comment"), null=True, blank=True) cached_label = models.CharField(_(u"Localisation"), max_length=500, null=True, blank=True, db_index=True) cached_location = models.CharField(_(u"Cached location"), max_length=500, null=True, blank=True, db_index=True) index = models.IntegerField(u"Container ID", default=0) + old_reference = models.CharField(_(u"Old reference"), max_length=200, + blank=True, null=True) external_id = models.TextField(_(u"External ID"), blank=True, null=True) auto_external_id = models.BooleanField( _(u"External ID is set automatically"), default=False) |