summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
authorValérie-Emma Leroux <emma@iggdrasil.net>2017-03-09 23:41:10 +0100
committerValérie-Emma Leroux <emma@iggdrasil.net>2017-03-09 23:41:10 +0100
commit775feabac583813e7f21d335d0809fdac7c5dd65 (patch)
tree410887b0dea38422055df70d92c690783a41b84e /archaeological_finds
parent02acc8610f34968cdeff8ea9cdd2129b36aa4809 (diff)
downloadIshtar-775feabac583813e7f21d335d0809fdac7c5dd65.tar.bz2
Ishtar-775feabac583813e7f21d335d0809fdac7c5dd65.zip
Finds table: add new fields and reorder
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/models_finds.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 5c28d1a69..eb88371ea 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -481,17 +481,16 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
CHECK_DICT = dict(CHECK_CHOICES)
SHOW_URL = 'show-find'
SLUG = 'find'
- TABLE_COLS = ['label', 'material_types__label', 'datings__period__label',
- 'base_finds__context_record__parcel__town',
- 'base_finds__context_record__operation__year',
- 'base_finds__context_record__operation__operation_code',
+ TABLE_COLS = ['label', 'base_finds__context_record__parcel__town',
+ 'base_finds__context_record__operation__common_name',
+ 'base_finds__context_record__parcel',
+ 'base_finds__context_record__label',
+ 'material_types__label', 'object_types', 'datings__period__label',
'container__cached_label',
- 'base_finds__batch',
- 'base_finds__context_record__parcel__town',
- 'base_finds__context_record__parcel', ]
+ 'base_finds__batch', ]
if settings.COUNTRY == 'fr':
TABLE_COLS.insert(
- 6, 'base_finds__context_record__operation__code_patriarche')
+ 1, 'base_finds__context_record__operation__code_patriarche')
TABLE_COLS_FOR_OPE = [
'base_finds__cache_short_id',
'base_finds__cache_complete_id',
@@ -502,6 +501,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
'base_finds__context_record__parcel__town',
'base_finds__context_record__parcel', ]
COL_LABELS = {
+ 'base_finds__context_record__label': _(u"Context record"),
'datings__period__label': _(u"Periods"),
'container__cached_label': _(u"Container"),
'material_types__label': _(u"Material types"),