Merge pull request #2885 from jumpserver/dev_perm

[Update] 用户授权资产树进行排序

Merge pull request #2885 from jumpserver/dev_perm
[Update] 用户授权资产树进行排序
ece8f082 · BaiJiangJie · GitHub · 64e1e619 · c52ea089 · ece8f082
Unverified Commit ece8f082 authored Jul 05, 2019 by BaiJiangJie Committed by GitHub Jul 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

user_permission.py apps/perms/api/user_permission.py +1 -0

No files found.
--- 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