summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-31 18:16:11 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-10-31 18:16:11 +0100
commitb98bfcfe20c9af59f69b7606c0351b4bbf344d00 (patch)
tree5da5ddd928f4bdf9eff103e13f6c72d08747899f /archaeological_finds
parent289e153c64ba5c8a87ed60fa1f8f2e7ef9634c78 (diff)
parent1c17748090f59acb36883ac114fb9cefdab47963 (diff)
downloadIshtar-b98bfcfe20c9af59f69b7606c0351b4bbf344d00.tar.bz2
Ishtar-b98bfcfe20c9af59f69b7606c0351b4bbf344d00.zip
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/models_finds.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 8052601bf..65850d4dc 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -543,7 +543,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
CHECK_DICT = dict(CHECK_CHOICES)
SHOW_URL = 'show-find'
SLUG = 'find'
- TABLE_COLS = ['label', 'base_finds__context_record__parcel__town',
+ TABLE_COLS = ['label', 'base_finds__context_record__parcel__town__name',
'base_finds__context_record__operation__common_name',
'base_finds__context_record__parcel',
'base_finds__context_record__label',
@@ -562,7 +562,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
'container__cached_label',
'container__cahed_location',
'description',
- 'base_finds__context_record__parcel__town',
+ 'base_finds__context_record__parcel__town__name',
'base_finds__context_record__parcel', ]
COL_LABELS = {
'base_finds__context_record__label': _(u"Context record"),
@@ -571,7 +571,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
'base_finds__context_record__operation__code_patriarche': _(
u"Operation (code)"
),
- 'base_finds__context_record__parcel__town': _(u"Town"),
+ 'base_finds__context_record__parcel__town__name': _(u"Town"),
'base_finds__context_record__operation__common_name': _(
u"Operation (name)"
),
@@ -622,7 +622,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
'base_finds__context_record':
'base_finds__context_record__pk',
'base_finds__context_record__parcel__town':
- 'base_finds__context_record__parcel__town',
+ 'base_finds__context_record__parcel__town__pk',
'base_finds__context_record__operation__year':
'base_finds__context_record__operation__year__contains',
'base_finds__context_record__operation':