From b7fcf80fc55e25623db17097f2882fe2a63126d3 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 6 Aug 2018 18:16:25 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/assets/user_asset_list.html     | 46 ++++++-------------
 apps/perms/api.py                             |  4 +-
 .../templates/users/user_granted_asset.html   |  7 ++-
 apps/users/views/user.py                      |  1 -
 4 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html
index e1284b7a7..dc799e734 100644
--- a/apps/assets/templates/assets/user_asset_list.html
+++ b/apps/assets/templates/assets/user_asset_list.html
@@ -62,7 +62,7 @@
 
 {% block custom_foot_js %}
 <script>
-var zTree, rMenu, asset_table;
+var zTree, asset_table;
 var inited = false;
 var url;
 function initTable() {
@@ -71,14 +71,11 @@ function initTable() {
     } else {
         inited = true;
     }
+    console.log("init table")
+    url = "{% url 'api-perms:my-assets' %}";
     var options = {
         ele: $('#user_assets_table'),
         columnDefs: [
-            {#{targets: 1, createdCell: function (td, cellData, rowData) {#}
-            {#        {% url 'assets:asset-detail' pk=DEFAULT_PK as the_url  %}#}
-            {#        var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';#}
-            {#        $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));#}
-            {#    }},#}
             {targets: 1, createdCell: function (td, cellData, rowData) {
                 var detail_btn = '<a class="asset_detail" asset-id="rowData_id" data-toggle="modal" data-target="#user_asset_detail_modal" tabindex="0">'+ cellData +'</a>'
                 $(td).html(detail_btn.replace("rowData_id", rowData.id));
@@ -110,33 +107,13 @@ function initTable() {
 }
 
 function onSelected(event, treeNode) {
-    console.log("select");
     url = '{% url "api-perms:my-node-assets" node_id=DEFAULT_PK %}';
-    url = url.replace("{{ DEFAULT_PK }}", treeNode.id);
-    initTable();
+    url = url.replace("{{ DEFAULT_PK }}", treeNode.node_id);
     setCookie('node_selected', treeNode.id);
     asset_table.ajax.url(url);
     asset_table.ajax.reload();
 }
 
-function selectQueryNode() {
-    var query_node_id = $.getUrlParam("node");
-    var cookie_node_id = getCookie('node_selected');
-    var node;
-    var node_id;
-
-    if (query_node_id !== null) {
-        node_id = query_node_id
-    } else if (cookie_node_id !== null) {
-        node_id = cookie_node_id;
-    }
-
-    node = zTree.getNodesByParam("id", node_id, null);
-    if (node){
-        zTree.selectNode(node[0]);
-    }
-}
-
 function initTree() {
     var setting = {
         view: {
@@ -156,22 +133,25 @@ function initTree() {
     var zNodes = [];
     $.get("{% url 'api-perms:my-nodes' %}", function(data, status){
         $.each(data, function (index, value) {
-            value["pId"] = value["parent"];
-            if (value["key"] === "0") {
-                value["open"] = true;
+            value["node_id"] = value["id"];
+            value["id"] = value["tree_id"];
+            if (value["tree_id"] !== value["tree_parent"]) {
+                value["pId"] = value["tree_parent"];
             }
-            value["name"] = value["value"]
+            value["isParent"] = value["is_node"];
+            value['name'] = value['value'];
         });
         zNodes = data;
         $.fn.zTree.init($("#assetTree"), setting, zNodes);
         zTree = $.fn.zTree.getZTreeObj("assetTree");
-		rMenu = $("#rMenu");
-		selectQueryNode();
+        var root = zTree.getNodes()[0];
+        zTree.expandNode(root);
     });
 }
 
 $(document).ready(function () {
     initTree();
+    initTable();
 })
 .on('click', '.asset_detail', function() {
     var data = asset_table.ajax.json();
diff --git a/apps/perms/api.py b/apps/perms/api.py
index d8691a4c2..d1ea10cf1 100644
--- a/apps/perms/api.py
+++ b/apps/perms/api.py
@@ -15,8 +15,6 @@ from .models import AssetPermission
 from .hands import AssetGrantedSerializer, User, UserGroup, Asset, Node, \
     NodeGrantedSerializer, SystemUser, NodeSerializer
 from . import serializers
-from orgs.utils import set_current_org
-from orgs.models import Organization
 
 
 class AssetPermissionViewSet(viewsets.ModelViewSet):
@@ -58,7 +56,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
         return permissions
 
 
-class UserGrantedAssetsApi(ListAPIView):
+class UserGrantedAssetsApi(RootOrgViewMixin, ListAPIView):
     """
     用户授权的所有资产
     """
diff --git a/apps/users/templates/users/user_granted_asset.html b/apps/users/templates/users/user_granted_asset.html
index 5b30c71b6..fc2cec031 100644
--- a/apps/users/templates/users/user_granted_asset.html
+++ b/apps/users/templates/users/user_granted_asset.html
@@ -72,6 +72,7 @@ function initTable() {
     } else {
         inited = true;
     }
+    url = "{% url 'api-perms:user-assets' pk=object.id %}";
     var options = {
         ele: $('#user_assets_table'),
         columnDefs: [
@@ -102,15 +103,12 @@ function initTable() {
             {data: "system_users_granted", orderable: false}
         ]
     };
-    return jumpserver.initDataTable(options);
+    asset_table = jumpserver.initDataTable(options);
 }
 
 function onSelected(event, treeNode) {
     url = '{% url "api-perms:user-node-assets" pk=object.id node_id=DEFAULT_PK %}';
-    console.log(">>>>>>>>>>>>>>>>>>>>>>>", treeNode.node_id, treeNode.id, treeNode);
     url = url.replace("{{ DEFAULT_PK }}", treeNode.node_id);
-    setCookie('node_selected', treeNode.node_id);
-    asset_table = initTable();
     asset_table.ajax.url(url);
     asset_table.ajax.reload();
 }
@@ -153,6 +151,7 @@ function initTree() {
 
 $(document).ready(function () {
     initTree();
+    initTable();
 });
 </script>
 {% endblock %}
diff --git a/apps/users/views/user.py b/apps/users/views/user.py
index cb0b45bad..133298c43 100644
--- a/apps/users/views/user.py
+++ b/apps/users/views/user.py
@@ -342,7 +342,6 @@ class UserBulkImportView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
 class UserGrantedAssetView(AdminUserRequiredMixin, DetailView):
     model = User
     template_name = 'users/user_granted_asset.html'
-    object = None
 
     def get_context_data(self, **kwargs):
         context = {