diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-15 10:00:12 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-15 10:00:12 +0100 |
| commit | cd2854ba9d57d40ae2bd95d8926345c7d63fc2b3 (patch) | |
| tree | 783b84ab3738d0e43a4144f02748b4ef9b107080 /archaeological_finds | |
| parent | f149232155219bdb5f9e73c580bb0e0b3d285ae8 (diff) | |
| download | Ishtar-cd2854ba9d57d40ae2bd95d8926345c7d63fc2b3.tar.bz2 Ishtar-cd2854ba9d57d40ae2bd95d8926345c7d63fc2b3.zip | |
Refactoring: EXTRA_FULL_FIELDS_LABELS -> COL_LABELS (with merge) (refs #3491)
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/models_finds.py | 20 | ||||
| -rw-r--r-- | archaeological_finds/models_treatments.py | 2 |
2 files changed, 10 insertions, 12 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index eb88371ea..9b4860e51 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -502,8 +502,16 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__context_record__parcel', ] COL_LABELS = { 'base_finds__context_record__label': _(u"Context record"), - 'datings__period__label': _(u"Periods"), + 'base_finds__cache_short_id': _(u"Base find - Short ID"), + 'base_finds__cache_complete_id': _(u"Base find - Complete ID"), + 'base_finds__comment': _(u"Base find - Comment"), + 'base_finds__description': _(u"Base find - Description"), + 'base_finds__topographic_localisation': _(u"Base find - " + u"Topographic localisation"), + 'base_finds__special_interest': _(u"Base find - Special interest"), + 'base_finds__discovery_date': _(u"Base find - Discovery date"), 'container__cached_label': _(u"Container"), + 'datings__period__label': _(u"Periods"), 'material_types__label': _(u"Material types"), } @@ -513,16 +521,6 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__topographic_localisation', 'base_finds__special_interest', 'base_finds__discovery_date'] - EXTRA_FULL_FIELDS_LABELS = { - 'base_finds__cache_short_id': _(u"Base find - Short ID"), - 'base_finds__cache_complete_id': _(u"Base find - Complete ID"), - 'base_finds__comment': _(u"Base find - Comment"), - 'base_finds__description': _(u"Base find - Description"), - 'base_finds__topographic_localisation': _(u"Base find - " - u"Topographic localisation"), - 'base_finds__special_interest': _(u"Base find - Special interest"), - 'base_finds__discovery_date': _(u"Base find - Discovery date"), - } ATTRS_EQUIV = {'get_first_base_find': 'base_finds'} # search parameters diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 3e9077a48..dd080835e 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -285,7 +285,7 @@ class AbsFindTreatments(models.Model): treatment_nb = models.IntegerField(_(u"Order")) TABLE_COLS = ["treatment__" + col for col in Treatment.TABLE_COLS] + \ ['treatment_nb'] - EXTRA_FULL_FIELDS_LABELS = { + COL_LABELS = { 'treatment__treatment_type': _(u"Treatment type"), 'treatment__start_date': _(u"Start date"), 'treatment__end_date': _(u"End date"), |