Merge branch 'release/1.6.1'

Author: wuyue92tree

adminlteui/__init__.py

@@ -1,2 +1,2 @@
-version = '1.6.0'
+version = '1.6.1'
 default_app_config = 'adminlteui.apps.AdminlteUIConfig'

adminlteui/templatetags/adminlte_menu.py

@@ -145,8 +145,13 @@ def get_menu(context, request, position='left'):
                 ordered_apps_dict[app.get('app_label')] = app
             else:
                 un_ordered_apps.append(app)
-        ordered_apps = [ordered_apps_dict.get(order_app) for order_app in ordered_apps]
-        available_apps = ordered_apps + un_ordered_apps
+        _ordered_apps = []
+        # fix app in ADMINLTE_SETTINGS but current_user has not perm
+        for order_app in ordered_apps:
+            if not ordered_apps_dict.get(order_app):
+                continue
+            _ordered_apps.append(ordered_apps_dict.get(order_app))
+        available_apps = _ordered_apps + un_ordered_apps
 
     for app in available_apps:
         if app.get('app_label') == 'django_admin_settings':
@@ -182,8 +187,14 @@ def get_menu(context, request, position='left'):
                         ordered_models_dict[model.get('object_name').lower()] = model
                     else:
                         un_ordered_models.append(model)
-                ordered_models = [ordered_models_dict.get(ordered_model) for ordered_model in ordered_models]
-                app['models'] = ordered_models + un_ordered_models
+
+                _ordered_models = []
+                # fix model in ADMINLTE_SETTINGS but current_user has not perm
+                for order_model in ordered_models:
+                    if not ordered_models_dict.get(order_model):
+                        continue
+                    _ordered_models.append(ordered_models_dict.get(order_model))
+                app['models'] = _ordered_models + un_ordered_models
 
             for model in app.get('models', []):
                 # setup model icon

docs/about.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## [v1.6.1](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.6.1)
+- fix app in ADMINLTE_SETTINGS but current_user has not perm
+- fix model in ADMINLTE_SETTINGS but current_user has not perm
+
 ## [v1.6.0](https://github.com/wuyue92tree/django-adminlte-ui/releases/tag/1.6.0)
 
 - fix #26 case by modify list_per_page with '…' str