diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-09 23:08:51 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-09 23:08:51 +0100 |
| commit | c2d86b659a9ad00b1e2cb0485e1310504c8fd03c (patch) | |
| tree | d95d1ca9e9971b465f235cbb86091cd2cf3c7325 /archaeological_operations/models.py | |
| parent | 1c381564ea9ed133f73e0b330468b204e7a034f1 (diff) | |
| parent | 53f0a5c95c34c0db67528422583dc3e90f20f705 (diff) | |
| download | Ishtar-c2d86b659a9ad00b1e2cb0485e1310504c8fd03c.tar.bz2 Ishtar-c2d86b659a9ad00b1e2cb0485e1310504c8fd03c.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index e74d02647..bc2169009 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -177,9 +177,8 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, ValueGetter, ShortMenuItem, DashboardFormItem): QUALITY_DICT = dict(QUALITY) SHOW_URL = 'show-operation' - TABLE_COLS = ['year_index', 'operation_type', 'remains', 'towns', - 'associated_file_short_label', 'start_date', - 'excavation_end_date'] + TABLE_COLS = ['year', 'towns', 'common_name', 'operation_type', + 'start_date', 'excavation_end_date', 'remains'] IMAGE_PREFIX = 'operations/' SLUG = 'operation' @@ -200,7 +199,6 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, 'scientific_documentation_comment__icontains', 'abstract': 'abstract__icontains', 'end_date': 'end_date__isnull', - 'year_index': ('year', 'operation_code'), 'start_before': 'start_date__lte', 'start_after': 'start_date__gte', 'end_before': 'excavation_end_date__lte', @@ -231,7 +229,6 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, EXTRA_FULL_FIELDS_LABELS = { 'full_code_patriarche': u"Code patriarche", - 'year_index': _(u"Year - Index"), 'associated_file_short_label': _(u"Associated file (label)"), 'operator__name': _(u"Operator name"), 'scientist__raw_name': _(u"Scientist (full name)"), |