From 3555eccdccc0ea67459fabf0a12b85e31b017758 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 8 Nov 2018 20:33:26 +0100 Subject: Allow deactivation of "auto-pin" and of "pin menu" in the profile (refs #4307) --- ishtar_common/context_processors.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ishtar_common/context_processors.py') diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 8c965f99f..0dc907ffd 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -61,10 +61,12 @@ def get_base_context(request): session=request.session) menu.init() - if hasattr(request.user, 'ishtaruser') and request.user.ishtaruser and \ - request.user.ishtaruser.has_right('administrator', + if hasattr(request.user, 'ishtaruser') and request.user.ishtaruser: + if request.user.ishtaruser.has_right('administrator', session=request.session): - dct['ADMIN'] = True + dct['ADMIN'] = True + if request.user.ishtaruser.current_profile.display_pin_menu: + dct['DISPLAY_PIN_MENU'] = True if menu.selected_idx is not None: dct['current_theme'] = "theme-%d" % (menu.selected_idx + 1) dct['MENU'] = menu -- cgit v1.2.3