diff options
| -rw-r--r-- | archaeological_finds/forms.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 26ba8350f..9e0d85c3d 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -142,7 +142,7 @@ class FindForm(CustomForm, ManageOldType): 'get_first_base_find__spatial_reference_system': SpatialReferenceSystem} label = forms.CharField( - label=_(u"Free ID"), + label=_(u"Label"), validators=[validators.MaxLengthValidator(60)]) previous_id = forms.CharField(label=_("Previous ID"), required=False) description = forms.CharField(label=_("Description"), @@ -350,7 +350,7 @@ class FindSelect(TableSelect): search_vector = forms.CharField(label=_(u"Full text search")) base_finds__cache_short_id = forms.CharField(label=_(u"Short ID")) base_finds__cache_complete_id = forms.CharField(label=_(u"Complete ID")) - label = forms.CharField(label=_(u"Free ID")) + label = forms.CharField(label=_(u"Label")) base_finds__context_record__parcel__town = get_town_field() base_finds__context_record__operation__year = forms.IntegerField( label=_(u"Year")) @@ -633,7 +633,7 @@ class ResultFindForm(ManageOldType, forms.Form): form_label = _(u"Resulting find") associated_models = {'material_type': models.MaterialType} label = forms.CharField( - label=_(u"Free ID"), + label=_(u"Label"), validators=[validators.MaxLengthValidator(60)]) description = forms.CharField(label=_(u"Precise description"), widget=forms.Textarea) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 7d9b4bd8a..382b793ef 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -207,7 +207,7 @@ class BFBulkView(object): class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms): EXTERNAL_ID_KEY = 'base_find_external_id' EXTERNAL_ID_DEPENDENCIES = ['find'] - label = models.TextField(_(u"Free ID")) + label = models.TextField(_(u"Label")) external_id = models.TextField(_(u"External ID"), blank=True, null=True) auto_external_id = models.BooleanField( _(u"External ID is set automatically"), default=False) @@ -556,7 +556,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, CHECK_DICT = dict(CHECK_CHOICES) SHOW_URL = 'show-find' SLUG = 'find' - TABLE_COLS = ['label', 'base_finds__context_record__parcel__town__name', + TABLE_COLS = ['external_id', 'label', 'base_finds__context_record__parcel__town__name', 'base_finds__context_record__operation__common_name', 'base_finds__context_record__parcel', 'base_finds__context_record__label', @@ -678,7 +678,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, auto_external_id = models.BooleanField( _(u"External ID is set automatically"), default=False) order = models.IntegerField(_(u"Order"), default=1) - label = models.TextField(_(u"Free ID")) + label = models.TextField(_(u"Label")) description = models.TextField(_(u"Description"), blank=True, null=True) material_types = models.ManyToManyField( MaterialType, verbose_name=_(u"Material types"), related_name='finds', diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 96a1cee61..bc628883e 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -15,7 +15,7 @@ {% include "ishtar/blocks/window_image.html" %} <div class="card-body"> <p class="card-text"> - <p class="window-refs" title="{% trans 'Free ID' %}">{{ item.label|default:"" }}</p> + <p class="window-refs" title="{% trans 'Label' %}">{{ item.label|default:"" }}</p> <p class='window-refs' title="{% trans 'Base find - Complete ID' %}">{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.complete_id}}{% endfor %}</p> <p class='window-refs' title="{% trans 'Base find - Short ID' %}">{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.short_id}}{% endfor %}</p> <p class="window-refs" title="{% trans 'Find - Administrative ID' %}">{{ item.administrative_index|default:"" }}</p> |