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_context_records/models.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_context_records/models.py')
| -rw-r--r-- | archaeological_context_records/models.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index b838b9a57..883433517 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -204,7 +204,8 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem, ImageModel, OwnPerms, 'archaeological_sites': 'operation__archaeological_sites__pk', 'cached_label': 'cached_label__icontains', } - RELATION_TYPES_PREFIX = {'ope_relation_types': 'operation__'} + RELATION_TYPES_PREFIX = {'ope_relation_types': 'operation__', + 'cr_relation_types': ''} RELATIVE_SESSION_NAMES = [ ('operation', 'operation__pk'), ('file', 'operation__associated_file__pk')] |