diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-02-14 17:49:37 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-02-19 14:43:48 +0100 |
commit | 4f60b4805a7eac04c2a8ec2116a245dbeec3c822 (patch) | |
tree | 561f87e11ae60c96320523c80c6317ff8f1d2f99 /ishtar_common/views.py | |
parent | 94f357939957dc8a5de453224913dbecdc4dc9db (diff) | |
download | Ishtar-4f60b4805a7eac04c2a8ec2116a245dbeec3c822.tar.bz2 Ishtar-4f60b4805a7eac04c2a8ec2116a245dbeec3c822.zip |
✨ generate_permissions
manage:
- possession (direct, creation, basket)
- heritage
- areas association
- requests ({USER} special syntax)
Diffstat (limited to 'ishtar_common/views.py')
-rw-r--r-- | ishtar_common/views.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 6c209a848..f01e848a0 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -79,6 +79,8 @@ from ishtar_common.utils_migrations import HOMEPAGE_DEFAULT, HOMEPAGE_TITLE from ishtar_common.utils import ( clean_session_cache, CSV_OPTIONS, + get_current_item_keys, + get_current_item_keys_dict, get_field_labels_from_path, get_person_gdpr_log, get_random_item_image_link, @@ -92,13 +94,7 @@ from ishtar_common.utils import ( from ishtar_common.widgets import JQueryAutoComplete from ishtar_common import tasks -convert_document = None -if settings.USE_LIBREOFFICE: - from ishtar_common.libreoffice import convert_document - from .views_item import ( - CURRENT_ITEM_KEYS, - CURRENT_ITEM_KEYS_DICT, check_permission, display_item, get_item, @@ -108,6 +104,10 @@ from .views_item import ( get_short_html_detail, ) +convert_document = None +if settings.USE_LIBREOFFICE: + from ishtar_common.libreoffice import convert_document + logger = logging.getLogger(__name__) @@ -700,7 +700,8 @@ def shortcut_menu(request): def get_current_items(request): currents = {} - for key, model in CURRENT_ITEM_KEYS: + current_item_keys = get_current_item_keys() + for key, model in current_item_keys: currents[key] = None if key in request.session and request.session[key]: try: @@ -711,7 +712,8 @@ def get_current_items(request): def unpin(request, item_type, cascade=False): - if item_type not in CURRENT_ITEM_KEYS_DICT.keys(): + current_item_keys_dict = get_current_item_keys_dict() + if item_type not in current_item_keys_dict.keys(): logger.warning("unpin unknow type: {}".format(item_type)) return HttpResponse("nok") if "administrativeact" in item_type: |