From b20bfb50b82293259daa975469748f6728c8974f Mon Sep 17 00:00:00 2001 From: GwynBleidD Date: Thu, 8 Nov 2018 08:56:00 +0200 Subject: [PATCH] Fixed 500 error when no permission to module Error was occuring when user had no permission to module that was added to menu due to missing code for handling None elements in menu (that are returned on such conditions, so items that user has no permissions to won't have entries displayed in menu). --- admin_toolbox/sidebar/templatetags/admin_toolbox_sidebar.py | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/admin_toolbox/sidebar/templatetags/admin_toolbox_sidebar.py b/admin_toolbox/sidebar/templatetags/admin_toolbox_sidebar.py index 7c875a3..1fa15c1 100644 --- a/admin_toolbox/sidebar/templatetags/admin_toolbox_sidebar.py +++ b/admin_toolbox/sidebar/templatetags/admin_toolbox_sidebar.py @@ -71,6 +71,10 @@ def admin_sidebar_content(context, menu_name='default'): continue item = current_items[item_no] + if item is None: + current_items.pop(item_no) + continue + if 'items' in item: level_stack.append((len(level_stack), item['items'], 0)) continue diff --git a/setup.py b/setup.py index 4865e0e..91a3987 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( name='django-admin-toolbox', - version='1.0.0dev11', + version='1.0.0dev12', description='Django admin toolbox - bunch of improvements for default django admin', long_description=long_description,