summaryrefslogtreecommitdiff
path: root/archaeological_context_records/models.py
diff options
context:
space:
mode:
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
commitcd2854ba9d57d40ae2bd95d8926345c7d63fc2b3 (patch)
tree783b84ab3738d0e43a4144f02748b4ef9b107080 /archaeological_context_records/models.py
parentf149232155219bdb5f9e73c580bb0e0b3d285ae8 (diff)
downloadIshtar-cd2854ba9d57d40ae2bd95d8926345c7d63fc2b3.tar.bz2
Ishtar-cd2854ba9d57d40ae2bd95d8926345c7d63fc2b3.zip
Refactoring: EXTRA_FULL_FIELDS_LABELS -> COL_LABELS (with merge) (refs #3491)
Diffstat (limited to 'archaeological_context_records/models.py')
-rw-r--r--archaeological_context_records/models.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 04ca358e3..1ffdea2f3 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -159,9 +159,17 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
TABLE_COLS.insert(1, 'operation__code_patriarche')
TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit',
'datings__period__label', 'description']
- COL_LABELS = {'section__parcel_number': _(u"Parcel"),
- 'datings__period__label': _(u"Periods"),
- 'parcel__town__name': _(u"Town")}
+ COL_LABELS = {
+ 'datings__period__label': _(u"Periods"),
+ 'datings__period': _(u"Datings (period)"),
+ 'detailled_related_context_records': _(u"Related context records"),
+ 'operation__code_patriarche': u"Operation (code patriarche)",
+ 'parcel__external_id': _(u"Parcel (external ID)"),
+ 'parcel__town__name': _(u"Parcel (town)"),
+ 'parcel__town': _(u"Parcel (town)"),
+ 'parcel__year': _(u"Parcel (year)"),
+ 'section__parcel_number': _(u"Parcel"),
+ }
CONTEXTUAL_TABLE_COLS = {
'full': {
'related_context_records': 'detailled_related_context_records'
@@ -188,14 +196,6 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
RELATIVE_SESSION_NAMES = [
('operation', 'operation__pk'),
('file', 'operation__associated_file__pk')]
- EXTRA_FULL_FIELDS_LABELS = {
- 'parcel__town': _(u"Parcel (town)"),
- 'detailled_related_context_records': _(u"Related context records"),
- 'operation__code_patriarche': u"Operation (code patriarche)",
- 'parcel__external_id': _(u"Parcel (external ID)"),
- 'datings__period': _(u"Datings (period)"),
- 'parcel__year': _(u"Parcel (year)"),
- }
# fields
external_id = models.TextField(_(u"External ID"), blank=True, null=True)