From 8f5e91bc3465effacae926b2726f2275d1bb73df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Mon, 22 Jul 2019 11:12:38 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=8E=88=E6=9D=83=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E4=B8=8B=E6=89=80=E6=9C=89=E7=9A=84=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=20(#3001)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/user_asset_list.html        | 2 +-
 apps/perms/api/user_permission.py                        | 7 ++++++-
 apps/perms/utils/asset_permission.py                     | 6 ++++--
 apps/perms/utils/stack.py                                | 3 ++-
 apps/users/templates/users/user_granted_asset.html       | 2 +-
 apps/users/templates/users/user_group_granted_asset.html | 2 +-
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html
index d021df0d7..4f0b6e671 100644
--- a/apps/assets/templates/assets/user_asset_list.html
+++ b/apps/assets/templates/assets/user_asset_list.html
@@ -23,7 +23,7 @@
 <script>
 var treeUrl = "{% url 'api-perms:my-nodes-as-tree' %}?&cache_policy=1";
 var assetTableUrl = "{% url 'api-perms:my-assets' %}?cache_policy=1";
-var selectUrl = '{% url "api-perms:my-node-assets" node_id=DEFAULT_PK %}?cache_policy=1';
+var selectUrl = '{% url "api-perms:my-node-assets" node_id=DEFAULT_PK %}?cache_policy=1&all=1';
 var showAssetHref = false; // Need input default true
 var actions = {
     targets: 4, createdCell: function (td, cellData) {
diff --git a/apps/perms/api/user_permission.py b/apps/perms/api/user_permission.py
index 9632f4caa..f9aff53b8 100644
--- a/apps/perms/api/user_permission.py
+++ b/apps/perms/api/user_permission.py
@@ -88,13 +88,18 @@ class UserGrantedNodeAssetsApi(UserPermissionCacheMixin, GrantAssetsMixin, ListA
 
     def get_queryset(self):
         user = self.get_object()
+        query_all = self.request.query_params.get("all", "0") == "1"
         self.util = AssetPermissionUtil(user, cache_policy=self.cache_policy)
         key = self.get_node_key()
         nodes_items = self.util.get_nodes_with_assets()
         assets_system_users = {}
+        if query_all:
+            k = "all_assets"
+        else:
+            k = "assets"
         for item in nodes_items:
             if item["key"] == key:
-                assets_system_users = item["assets"]
+                assets_system_users = item[k]
                 break
         assets = []
         for asset_id, system_users in assets_system_users.items():
diff --git a/apps/perms/utils/asset_permission.py b/apps/perms/utils/asset_permission.py
index 2c2eaac05..05669e152 100644
--- a/apps/perms/utils/asset_permission.py
+++ b/apps/perms/utils/asset_permission.py
@@ -203,14 +203,16 @@ class GenerateTree:
         nodes = []
         for key, values in nodes_with_assets_amount.items():
             assets = {asset_id: self.assets.get(asset_id) for asset_id in values["assets"]}
+            all_assets = {asset_id: self.assets.get(asset_id) for asset_id in values["all_assets"]}
             nodes.append({
-                "key": key, "assets": assets,
+                "key": key, "assets": assets, "all_assets": all_assets,
                 "assets_amount": values["assets_amount"]
             })
         # 如果返回空节点，页面构造授权资产树报错
         if not nodes:
             nodes.append({
-                "key": const.EMPTY_NODE_KEY, "assets": {}, "assets_amount": 0
+                "key": const.EMPTY_NODE_KEY, "assets": {}, "assets_amount": 0,
+                "all_assets": {},
             })
         nodes.sort(key=lambda n: self.key_sort(n["key"]))
         self._nodes_with_assets = nodes
diff --git a/apps/perms/utils/stack.py b/apps/perms/utils/stack.py
index ac2e8b69f..039450a1b 100644
--- a/apps/perms/utils/stack.py
+++ b/apps/perms/utils/stack.py
@@ -102,7 +102,8 @@ class PermAssetsAmountUtil(PermStackUtilMixin):
         self.debug("出栈: {} 栈顶: {}".format(
             _node['key'], self.stack.top['key'] if self.stack.top else None)
         )
-        _node["assets_amount"] = len(_node["all_assets"] | _node["assets"])
+        _node["all_assets"] = _node["all_assets"] | _node["assets"]
+        _node["assets_amount"] = len(_node["all_assets"])
         self._nodes[_node.pop("key")] = _node
 
         if not self.stack.top:
diff --git a/apps/users/templates/users/user_granted_asset.html b/apps/users/templates/users/user_granted_asset.html
index fc5197a77..3747757cb 100644
--- a/apps/users/templates/users/user_granted_asset.html
+++ b/apps/users/templates/users/user_granted_asset.html
@@ -33,7 +33,7 @@
 {% block custom_foot_js %}
 <script>
 var assetTableUrl = "{% url 'api-perms:user-assets' pk=object.id %}?cache_policy=1";
-var selectUrl = '{% url "api-perms:user-node-assets" pk=object.id node_id=DEFAULT_PK %}?cache_policy=1';
+var selectUrl = '{% url "api-perms:user-node-assets" pk=object.id node_id=DEFAULT_PK %}?cache_policy=1&all=1';
 var treeUrl = "{% url 'api-perms:user-nodes-as-tree' pk=object.id %}?&cache_policy=1";
 
 $(document).ready(function () {
diff --git a/apps/users/templates/users/user_group_granted_asset.html b/apps/users/templates/users/user_group_granted_asset.html
index ba0119050..9e1355875 100644
--- a/apps/users/templates/users/user_group_granted_asset.html
+++ b/apps/users/templates/users/user_group_granted_asset.html
@@ -35,7 +35,7 @@
 <script>
 var treeUrl = "{% url 'api-perms:user-group-nodes-as-tree' pk=object.id %}?cache_policy=1";
 var assetTableUrl = "{% url 'api-perms:user-group-assets' pk=object.id %}?cache_policy=1";
-var selectUrl = '{% url "api-perms:user-group-node-assets" pk=object.id node_id=DEFAULT_PK %}?cache_policy=1';
+var selectUrl = '{% url "api-perms:user-group-node-assets" pk=object.id node_id=DEFAULT_PK %}?cache_policy=1&all=1';
 var showAssetHref = true; // Need input default true