diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:28:40 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-11 11:28:40 +0200 |
| commit | 9985406e7fd5d7561a79f5e9eeee36d007d66d76 (patch) | |
| tree | 11edfe5030983edca12d2a46d189e72eda5027db /archaeological_operations/views.py | |
| parent | c75b9f076f8893a50713e75cffde1b757c320ebe (diff) | |
| parent | cc12bf5d9c20591d321f4461d2795a58fac07d1c (diff) | |
| download | Ishtar-9985406e7fd5d7561a79f5e9eeee36d007d66d76.tar.bz2 Ishtar-9985406e7fd5d7561a79f5e9eeee36d007d66d76.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations/views.py')
| -rw-r--r-- | archaeological_operations/views.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 013e329a1..6c7fdbd98 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -138,9 +138,14 @@ def get_available_operation_code(request, year=None): get_operation = get_item( models.Operation, 'get_operation', 'operation', - bool_fields=['end_date__isnull', 'virtual_operation'], + bool_fields=['end_date__isnull', 'virtual_operation', + 'documentation_received', 'finds_received'], dated_fields=['start_date__lte', 'start_date__gte', - 'excavation_end_date__lte', 'excavation_end_date__gte'], + 'excavation_end_date__lte', 'excavation_end_date__gte', + 'documentation_deadline__lte', 'documentation_deadline__gte', + 'finds_deadline__lte', 'finds_deadline__gte', + ], + relative_session_names=[('file', 'associated_file__pk')], extra_request_keys={ 'common_name': 'common_name__icontains', 'comment': 'comment__icontains', @@ -167,6 +172,10 @@ get_operation = get_item( 'history_modifier__ishtaruser__person__pk', 'archaeological_sites': 'archaeological_sites__pk', + 'documentation_deadline_before': 'documentation_deadline__lte', + 'documentation_deadline_after': 'documentation_deadline__gte', + 'finds_deadline_before': 'finds_deadline__lte', + 'finds_deadline_after': 'finds_deadline__gte', }, ) show_operation = show_item(models.Operation, 'operation') @@ -216,7 +225,7 @@ get_administrativeactop = get_item( 'operation__associated_file__parcels__public_domain'), }, reversed_bool_fields=['index__isnull'], - relative_session_names={'operation': 'operation__pk'}) + relative_session_names=[('operation', 'operation__pk')]) get_administrativeact = get_item( models.AdministrativeAct, |