diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-15 11:34:32 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-15 11:34:32 +0200 |
commit | 54d6c8789255aa5500df6dc583a8fdbe96b8442a (patch) | |
tree | 9b6101e1df20be739157df2c8d6f391119bf3e48 /archaeological_finds/models_finds.py | |
parent | c3e4c309deb686685e34a441445b6104ba4913a7 (diff) | |
parent | c18fccf766ea9fd82ca82d8e4a7938c83512c416 (diff) | |
download | Ishtar-54d6c8789255aa5500df6dc583a8fdbe96b8442a.tar.bz2 Ishtar-54d6c8789255aa5500df6dc583a8fdbe96b8442a.zip |
Merge branch 'master' into develop
Conflicts:
archaeological_finds/forms_treatments.py
Diffstat (limited to 'archaeological_finds/models_finds.py')
-rw-r--r-- | archaeological_finds/models_finds.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 407270df9..4c02b170f 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -554,7 +554,10 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, REVERSED_BOOL_FIELDS = ['image__isnull'] RELATION_TYPES_PREFIX = { 'ope_relation_types': - 'base_finds__context_record__operation__'} + 'base_finds__context_record__operation__', + 'cr_relation_types': + 'base_finds__context_record__', + } RELATIVE_SESSION_NAMES = [ ('contextrecord', 'base_finds__context_record__pk'), ('operation', 'base_finds__context_record__operation__pk'), |