summaryrefslogtreecommitdiff
path: root/archaeological_context_records/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-20 19:28:38 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-20 19:28:38 +0100
commit2d3e00340e7ead78feb8af5278e96b4faffa1532 (patch)
tree6e8afa6acb32740033aabc4b5d80f7455cf2332c /archaeological_context_records/models.py
parent650737195d8edfcaca50a1e6d41a8e8b605f3f55 (diff)
downloadIshtar-2d3e00340e7ead78feb8af5278e96b4faffa1532.tar.bz2
Ishtar-2d3e00340e7ead78feb8af5278e96b4faffa1532.zip
Fix col labels (refs #3421)
Diffstat (limited to 'archaeological_context_records/models.py')
-rw-r--r--archaeological_context_records/models.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index cf39870ca..518610aa5 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -122,7 +122,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
ValueGetter, ShortMenuItem):
SHOW_URL = 'show-contextrecord'
SLUG = 'contextrecord'
- TABLE_COLS = ['parcel__town', 'operation__year',
+ TABLE_COLS = ['parcel__town__name', 'operation__year',
'operation__operation_code',
'label', 'unit']
if settings.COUNTRY == 'fr':
@@ -130,7 +130,8 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit',
'datings__period__label', 'description']
COL_LABELS = {'section__parcel_number': _(u"Parcel"),
- 'datings__period__label': _(u"Periods")}
+ 'datings__period__label': _(u"Periods"),
+ 'parcel__town__name': _(u"Town")}
CONTEXTUAL_TABLE_COLS = {
'full': {
'related_context_records': 'detailled_related_context_records'
@@ -480,8 +481,9 @@ class RecordRelationView(models.Model):
class ContextRecordSource(Source):
SHOW_URL = 'show-contextrecordsource'
MODIFY_URL = 'record_source_modify'
- TABLE_COLS = ['context_record__operation', 'context_record'] + \
- Source.TABLE_COLS
+ TABLE_COLS = ['context_record__operation__cached_label', 'context_record']\
+ + Source.TABLE_COLS
+ COL_LABELS = {'context_record__operation__cached_label': _(u"Operation")}
# search parameters
RELATIVE_SESSION_NAMES = [