diff options
Diffstat (limited to 'archaeological_finds/views.py')
| -rw-r--r-- | archaeological_finds/views.py | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 5caaae64d..6ca09feb8 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -34,27 +34,38 @@ from wizards import * from forms import * import models +find_extra_keys = { + 'base_finds__context_record': + 'base_finds__context_record__pk', + 'base_finds__context_record__parcel__town': + 'base_finds__context_record__parcel__town', + 'base_finds__context_record__operation__year': + 'base_finds__context_record__operation__year__contains', + 'base_finds__context_record__operation': + 'base_finds__context_record__operation__pk', + 'base_finds__context_record__operation__code_patriarche': + 'base_finds__context_record__operation__code_patriarche', + 'dating__period': 'dating__period__pk', + 'base_finds__find__description': + 'base_finds__find__description__icontains', + 'base_finds__is_isolated': 'base_finds__is_isolated', + 'image': 'image__isnull'} + get_find = get_item( models.Find, 'get_find', 'find', bool_fields=['base_finds__is_isolated'], reversed_bool_fields=['image__isnull'], base_request={'downstream_treatment__isnull': True}, - extra_request_keys={ - 'base_finds__context_record': - 'base_finds__context_record__pk', - 'base_finds__context_record__parcel__town': - 'base_finds__context_record__parcel__town', - 'base_finds__context_record__operation__year': - 'base_finds__context_record__operation__year__contains', - 'base_finds__context_record__operation': - 'base_finds__context_record__operation__pk', - 'base_finds__context_record__operation__code_patriarche': - 'base_finds__context_record__operation__code_patriarche', - 'dating__period': 'dating__period__pk', - 'base_finds__find__description': - 'base_finds__find__description__icontains', - 'base_finds__is_isolated': 'base_finds__is_isolated', - 'image': 'image__isnull'}) + extra_request_keys=find_extra_keys) + +get_find_for_ope = get_item( + models.Find, 'get_find', 'find', + bool_fields=['base_finds__is_isolated'], + reversed_bool_fields=['image__isnull'], + base_request={'downstream_treatment__isnull': True}, + extra_request_keys=find_extra_keys, + own_table_cols=models.Find.TABLE_COLS_FOR_OPE) + get_findsource = get_item( models.FindSource, 'get_findsource', 'findsource', extra_request_keys={ |