diff options
Diffstat (limited to 'ishtar_common/views_item.py')
| -rw-r--r-- | ishtar_common/views_item.py | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 9df2277de..517c34ec9 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -35,7 +35,8 @@ from menus import Menu import models from archaeological_files.models import File -from archaeological_operations.models import Operation, ArchaeologicalSite +from archaeological_operations.models import Operation, ArchaeologicalSite, \ + AdministrativeAct from archaeological_context_records.models import ContextRecord from archaeological_finds.models import Find, FindBasket, Treatment, \ TreatmentFile @@ -45,14 +46,21 @@ logger = logging.getLogger(__name__) ENCODING = settings.ENCODING or 'utf-8' -CURRENT_ITEM_KEYS = (('file', File), - ('operation', Operation), - ('site', ArchaeologicalSite), - ('contextrecord', ContextRecord), - ('warehouse', Warehouse), - ('find', Find), - ('treatmentfile', TreatmentFile), - ('treatment', Treatment)) +CURRENT_ITEM_KEYS = ( + ('file', File), + ('operation', Operation), + ('site', ArchaeologicalSite), + ('contextrecord', ContextRecord), + ('warehouse', Warehouse), + ('find', Find), + ('treatmentfile', TreatmentFile), + ('treatment', Treatment), + ('administrativeact', AdministrativeAct), + ('administrativeactop', AdministrativeAct), + ('administrativeactfile', AdministrativeAct), + ('administrativeacttreatment', AdministrativeAct), + ('administrativeacttreatmentfile', AdministrativeAct), +) CURRENT_ITEM_KEYS_DICT = dict(CURRENT_ITEM_KEYS) @@ -1037,6 +1045,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], and_reqs.append(reqs) pinned_search = "" + # manage default and pinned search if 'submited' not in request_items and full != 'shortcut': if data_type == 'csv' and func_name in request.session: dct = request.session[func_name] |