diff --git a/apps/assets/templates/assets/_node_tree.html b/apps/assets/templates/assets/_node_tree.html index 3f6e51596..93aed7d89 100644 --- a/apps/assets/templates/assets/_node_tree.html +++ b/apps/assets/templates/assets/_node_tree.html @@ -69,6 +69,9 @@ var treeUrl = '{% url 'api-assets:node-children-tree' %}?assets=0'; // "showAssets": false, // } function initNodeTree(options) { + if (options.showAssets) { + treeUrl = setUrlParam(treeUrl, 'assets', '1') + } var setting = { view: { dblClickExpand: false, @@ -106,10 +109,6 @@ function initNodeTree(options) { beforeAsync: options.beforeAsync || defaultCallback("Before async") } }; - if (options.showAssets) { - treeUrl = setUrlParam(treeUrl, 'assets', '1') - } - $.get(treeUrl, function(data, status){ zNodes = data; zTree = $.fn.zTree.init($("#nodeTree"), setting, zNodes); diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html index 5a10a22c2..859ad64c0 100644 --- a/apps/perms/templates/perms/asset_permission_list.html +++ b/apps/perms/templates/perms/asset_permission_list.html @@ -200,7 +200,7 @@ function initTree() { onSelected: onNodeSelected, beforeAsync: beforeNodeAsync, showMenu: false, - showAssets: true, + showAssets: true }) }