Skip to content

Commit b0d4869

Browse files
committed
fix app/model in ADMINLTE_SETTINGS but current_user has not perm
1 parent 02f0798 commit b0d4869

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

adminlteui/templatetags/adminlte_menu.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,13 @@ def get_menu(context, request, position='left'):
145145
ordered_apps_dict[app.get('app_label')] = app
146146
else:
147147
un_ordered_apps.append(app)
148-
ordered_apps = [ordered_apps_dict.get(order_app) for order_app in ordered_apps]
149-
available_apps = ordered_apps + un_ordered_apps
148+
_ordered_apps = []
149+
# fix app in ADMINLTE_SETTINGS but current_user has not perm
150+
for order_app in ordered_apps:
151+
if not ordered_apps_dict.get(order_app):
152+
continue
153+
_ordered_apps.append(ordered_apps_dict.get(order_app))
154+
available_apps = _ordered_apps + un_ordered_apps
150155

151156
for app in available_apps:
152157
if app.get('app_label') == 'django_admin_settings':
@@ -182,8 +187,14 @@ def get_menu(context, request, position='left'):
182187
ordered_models_dict[model.get('object_name').lower()] = model
183188
else:
184189
un_ordered_models.append(model)
185-
ordered_models = [ordered_models_dict.get(ordered_model) for ordered_model in ordered_models]
186-
app['models'] = ordered_models + un_ordered_models
190+
191+
_ordered_models = []
192+
# fix model in ADMINLTE_SETTINGS but current_user has not perm
193+
for order_model in ordered_models:
194+
if not ordered_models_dict.get(order_model):
195+
continue
196+
_ordered_models.append(ordered_models_dict.get(order_model))
197+
app['models'] = _ordered_models + un_ordered_models
187198

188199
for model in app.get('models', []):
189200
# setup model icon

0 commit comments

Comments
 (0)