Merge pull request #2885 from jumpserver/dev_perm

[Update] 用户授权资产树进行排序
2019-07-05 12:41:30 +08:00 · 2019-07-05 12:41:30 +08:00 · ece8f082fb
parent 64e1e6191b c52ea089da
commit ece8f082fb
1 changed files with 1 additions and 0 deletions
--- a/apps/perms/api/user_permission.py
+++ b/apps/perms/api/user_permission.py
@ -270,6 +270,7 @@ class UserGrantedNodesWithAssetsAsTreeApi(UserPermissionCacheMixin, ListAPIView)
            for asset, system_users in assets.items():
                data = parse_asset_to_tree_node(node, asset, system_users)
                queryset.append(data)
+        queryset = sorted(queryset)
        return queryset