Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

remove SURFACE_MENU_ITEMS that user has no permission (UX) #23

Draft
fopina wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

remove SURFACE_MENU_ITEMS that user has no permission (UX) #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a8400f
remove SURFACE_MENU_ITEMS that user has no permission (UX) - WIP miss…
fopina Feb 5, 2023
e432096
surface menu items: re-use model if no items specified (and there was…
fopina Feb 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions theme/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ def get_menu_item_app_model(app_label, data):
if 'icon' in data:
item['icon'] = item.get('icon', 'fas fa-layer-group')

if not item['has_perms']:
return None
return item

def get_menu_item_app(data):
Expand All @@ -320,24 +322,35 @@ def get_menu_item_app(data):
else:
item = {'app_label': app_label, 'has_perms': True}

item['label'] = data.get('label', '')
if 'permissions' in data:
item['has_perms'] = item.get('has_perms', True) and context['user'].has_perms(data['permissions'])
if not item['has_perms']:
return None

# use label from settings if there is one, otherwise re-use the one from app (if match), otherwise empty.
item['label'] = data.get('label', item.get('label', ''))
item['url_blank'] = data.get('url_blank', '')
item['icon'] = data.get('icon', 'fas fa-layer-group')

if 'items' in data:
item['items'] = list(map(lambda x: get_menu_item_app_model(app_label, x), data['items']))
item['items'] = [
get_menu_item_app_model(app_label, x)
for x in data['items']
if get_menu_item_app_model(app_label, x) is not None
]
elif 'models' in item:
# fallback to all models if this menu item matches an app_label
item['items'] = item['models']

if 'url' in data:
item['url'] = get_menu_item_url(data['url'], original_app_list)

if 'permissions' in data:
item['has_perms'] = item.get('has_perms', True) and context['user'].has_perms(data['permissions'])

return item

for data in custom_app_list:
item = get_menu_item_app(data)
app_list.append(item)
if item is not None:
app_list.append(item)

else:

Expand Down