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 | ca2a1d9f718a173a104fd08916ccbc6810d30e3b (patch) | |
| tree | e8c2da5569c0a02183c7194942d580e6a31614f4 /archaeological_finds | |
| parent | 8fb2f3099e0a8e90fab1be3d9f7055581ffdf89a (diff) | |
| parent | 2401a5a5a156c3189e556d5dc6a2b4491942f48e (diff) | |
| download | Ishtar-ca2a1d9f718a173a104fd08916ccbc6810d30e3b.tar.bz2 Ishtar-ca2a1d9f718a173a104fd08916ccbc6810d30e3b.zip | |
Merge branch 'master' into develop
Conflicts:
ishtar_common/views.py
version.py
Diffstat (limited to 'archaeological_finds')
| -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', |