diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-17 12:15:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-17 12:15:46 +0200 |
| commit | 7d3609635c202ff36f865480bc34253041f51818 (patch) | |
| tree | e8c2da5569c0a02183c7194942d580e6a31614f4 /archaeological_finds/models_finds.py | |
| parent | dd9d9db0388514bc474e1594cc6bc2b992fa7b42 (diff) | |
| parent | e5dc6268a843e216ccf14469447d9b6f1ad43b49 (diff) | |
| download | Ishtar-7d3609635c202ff36f865480bc34253041f51818.tar.bz2 Ishtar-7d3609635c202ff36f865480bc34253041f51818.zip | |
Merge branch 'master' into develop
Conflicts:
ishtar_common/views.py
version.py
Diffstat (limited to 'archaeological_finds/models_finds.py')
| -rw-r--r-- | archaeological_finds/models_finds.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 8d4945a0b..632df91f5 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -562,6 +562,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, } EXTRA_FULL_FIELDS = [ + 'datings', 'base_finds__cache_short_id', 'base_finds__cache_complete_id', 'base_finds__comment', 'base_finds__description', 'base_finds__topographic_localisation', @@ -603,7 +604,6 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, 'base_finds__context_record__operation__code_patriarche': 'base_finds__context_record__operation__code_patriarche', 'datings__period': 'datings__period__pk', - 'material_types': 'material_types__pk', 'base_finds__find__description': 'base_finds__find__description__icontains', 'base_finds__batch': 'base_finds__batch', |