diff options
| -rw-r--r-- | archaeological_context_records/models.py | 3 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 11 | ||||
| -rw-r--r-- | archaeological_finds/models_treatments.py | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 1ffdea2f3..dd0f0b736 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -153,7 +153,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ValueGetter, ShortMenuItem): SHOW_URL = 'show-contextrecord' SLUG = 'contextrecord' - TABLE_COLS = ['label', 'parcel__town__name', 'operation__common_name', + TABLE_COLS = ['label', 'operation__common_name', 'parcel__town__name', 'parcel__label', 'unit'] if settings.COUNTRY == 'fr': TABLE_COLS.insert(1, 'operation__code_patriarche') @@ -164,6 +164,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, 'datings__period': _(u"Datings (period)"), 'detailled_related_context_records': _(u"Related context records"), 'operation__code_patriarche': u"Operation (code patriarche)", + 'operation__common_name': u"Operation (name)", 'parcel__external_id': _(u"Parcel (external ID)"), 'parcel__town__name': _(u"Parcel (town)"), 'parcel__town': _(u"Parcel (town)"), diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 9b4860e51..5872a241f 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -490,7 +490,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__batch', ] if settings.COUNTRY == 'fr': TABLE_COLS.insert( - 1, 'base_finds__context_record__operation__code_patriarche') + 2, 'base_finds__context_record__operation__code_patriarche') TABLE_COLS_FOR_OPE = [ 'base_finds__cache_short_id', 'base_finds__cache_complete_id', @@ -504,6 +504,15 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__context_record__label': _(u"Context record"), 'base_finds__cache_short_id': _(u"Base find - Short ID"), 'base_finds__cache_complete_id': _(u"Base find - Complete ID"), + 'base_finds__context_record__operation__code_patriarche': _( + u"Operation (code)" + ), + 'base_finds__context_record__parcel__town': _(u"Town"), + 'base_finds__context_record__operation__common_name': _( + u"Operation (name)" + ), + 'base_finds__context_record__parcel': _(u"Parcel"), + 'base_finds__batch':_(u"Batch"), 'base_finds__comment': _(u"Base find - Comment"), 'base_finds__description': _(u"Base find - Description"), 'base_finds__topographic_localisation': _(u"Base find - " diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index dd080835e..2efedbc22 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -88,6 +88,8 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): COL_LABELS = { "downstream_cached_label": _(u"Downstream find"), "upstream_cached_label": _(u"Upstream find"), + "treatment_types__label": _(u"Type"), + "treatment_state__label": _(u"State"), } IMAGE_PREFIX = 'treatment' # extra keys than can be passed to save method |