diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 20:09:06 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-20 20:09:06 +0100 |
| commit | d26217d09080ef93fe0b36c3543a266d7a04c688 (patch) | |
| tree | 99faaf3ec3a2d6da7d265995419dc6af45a69fbe /archaeological_context_records/models.py | |
| parent | 4abb5ff78620c096ab4238535c8e4b22291a2cb1 (diff) | |
| parent | ac595e9aa13d27fb15e70eb1f6e2d11f928a4c4a (diff) | |
| download | Ishtar-d26217d09080ef93fe0b36c3543a266d7a04c688.tar.bz2 Ishtar-d26217d09080ef93fe0b36c3543a266d7a04c688.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'archaeological_context_records/models.py')
| -rw-r--r-- | archaeological_context_records/models.py | 10 |
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 = [ |