diff --git a/apps/assets/templates/assets/_node_tree.html b/apps/assets/templates/assets/_node_tree.html index 9a4004060..65e5b8f1e 100644 --- a/apps/assets/templates/assets/_node_tree.html +++ b/apps/assets/templates/assets/_node_tree.html @@ -68,10 +68,12 @@ var treeUrl = '{% url 'api-assets:node-children-tree' %}?assets=0'; // "otherMenu": "", // "showAssets": false, // } +var inited = false; function initNodeTree(options) { if (options.showAssets) { treeUrl = setUrlParam(treeUrl, 'assets', '1') } + var asyncTreeUrl = setUrlParam(treeUrl, 'refresh', '0'); var setting = { view: { dblClickExpand: false, @@ -84,7 +86,7 @@ function initNodeTree(options) { }, async: { enable: true, - url: treeUrl, + url: asyncTreeUrl, autoParam: ["id=key", "name=n", "level=lv"], type: 'get' }, @@ -109,16 +111,20 @@ function initNodeTree(options) { beforeAsync: options.beforeAsync || defaultCallback("Before async") } }; - $.get(treeUrl, function(data, status){ - zNodes = data; - zTree = $.fn.zTree.init($("#nodeTree"), setting, zNodes); + $.get(treeUrl, function (data, status) { + zTree = $.fn.zTree.init($("#nodeTree"), setting, data); rootNodeAddDom(zTree, function () { treeUrl = setUrlParam(treeUrl, 'refresh', '1'); - initTree(); - treeUrl = setUrlParam(treeUrl, 'refresh', '0') + initNodeTree(options); + treeUrl = setUrlParam(treeUrl, 'refresh', '0'); }); + inited = true; }); + if (inited) { + return + } + if (options.showMenu) { showMenu = true; rMenu = $("#rMenu"); diff --git a/apps/users/templates/users/_granted_assets.html b/apps/users/templates/users/_granted_assets.html index 8df8317e9..4214aee93 100644 --- a/apps/users/templates/users/_granted_assets.html +++ b/apps/users/templates/users/_granted_assets.html @@ -122,7 +122,7 @@ function initTree() { $.fn.zTree.init($("#assetTree"), setting, data); zTree = $.fn.zTree.getZTreeObj("assetTree"); rootNodeAddDom(zTree, function () { - treeUrl = treeUrl.replace('cache_policy=1', 'cache_policy=2'); + treeUrl = setUrlParam(treeUrl, 'cache_policy', '2'); initTree(); }); }); diff --git a/apps/users/templates/users/user_granted_asset.html b/apps/users/templates/users/user_granted_asset.html index 3747757cb..e42a52bab 100644 --- a/apps/users/templates/users/user_granted_asset.html +++ b/apps/users/templates/users/user_granted_asset.html @@ -34,7 +34,7 @@