diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-05 12:59:06 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-12 08:54:04 +0200 |
| commit | bd9e7d5d4f0eec90b0db39391e05919e4adb1342 (patch) | |
| tree | ac5e2385672ca97f8123eacd219e390ec80a02ae /archaeological_finds | |
| parent | 63e4f8cea38fdde5dbc1fe582b0307ad59370f81 (diff) | |
| download | Ishtar-bd9e7d5d4f0eec90b0db39391e05919e4adb1342.tar.bz2 Ishtar-bd9e7d5d4f0eec90b0db39391e05919e4adb1342.zip | |
Context record towns: change column and search to point directly (not through parcel)
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index a01bd45a6..6107b744e 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -432,7 +432,7 @@ class FindSelect(TableSelect): base_finds__cache_short_id = forms.CharField(label=_(u"Short ID")) base_finds__cache_complete_id = forms.CharField(label=_(u"Complete ID")) label = forms.CharField(label=_(u"Free ID")) - base_finds__context_record__parcel__town = get_town_field() + base_finds__context_record__town = get_town_field() base_finds__context_record__operation__year = forms.IntegerField( label=_(u"Year")) base_finds__context_record__operation__operation_code = forms.IntegerField( diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 9b0f085c7..dadda2003 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -587,7 +587,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, SHOW_URL = 'show-find' SLUG = 'find' TABLE_COLS = ['external_id', 'label', - 'base_finds__context_record__parcel__town__name', + 'base_finds__context_record__town__name', 'base_finds__context_record__operation__common_name', 'base_finds__context_record__label', 'material_types__label', 'object_types__label', @@ -604,7 +604,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, 'container__cached_label', 'container__cahed_location', 'description', - 'base_finds__context_record__parcel__town__name', + 'base_finds__context_record__town__name', 'base_finds__context_record__parcel', ] COL_LABELS = { 'base_finds__context_record__label': _(u"Context record"), @@ -613,7 +613,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, 'base_finds__context_record__operation__code_patriarche': _( u"Operation (code)" ), - 'base_finds__context_record__parcel__town__name': _(u"Town"), + 'base_finds__context_record__town__name': _(u"Town"), 'base_finds__context_record__operation__common_name': _( u"Operation (name)" ), @@ -670,8 +670,8 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, 'base_finds__context_record__pk', 'base_finds__context_record__archaeological_site': 'base_finds__context_record__archaeological_site__pk', - 'base_finds__context_record__parcel__town': - 'base_finds__context_record__parcel__town__pk', + 'base_finds__context_record__town': + 'base_finds__context_record__town__pk', 'base_finds__context_record__operation__year': 'base_finds__context_record__operation__year__contains', 'base_finds__context_record__operation': |