github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-05 17:30:30 +00:00
Code Issues Projects Releases Wiki Activity

[Update] Merge with dev

Browse Source
This commit is contained in:
ibuler
2019-10-21 15:19:21 +08:00
parent c2f78b1170 f3dc9b886b
commit 673ebbec1b
55 changed files with 610 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/static/js/jumpserver.js
View File

@@ -271,7 +271,7 @@ function requestApi(props) {
$.ajax({
url: props.url,
type: props.method || "PATCH",
data: props.body,
data: props.body || props.data,
contentType: props.content_type || "application/json; charset=utf-8",
dataType: props.data_type || "json"
}).done(function (data, textStatue, jqXHR) {
@@ -960,8 +960,13 @@ function initPopover($container, $progress, $idPassword, $el, password_check_rul
function rootNodeAddDom(ztree, callback) {
var refreshIcon = "<a id='tree-refresh'><i class='fa fa-refresh'></i></a>";
var rootNode = ztree.getNodes()[0];
var $rootNodeRef = $("#" + rootNode.tId + "_a");
$rootNodeRef.after(refreshIcon);
if (rootNode) {
var $rootNodeRef = $("#" + rootNode.tId + "_a");
$rootNodeRef.after(refreshIcon);
} else {
$rootNodeRef = $('#' + ztree.setting.treeId);
$rootNodeRef.html(refreshIcon);
}
var refreshIconRef = $('#tree-refresh');
refreshIconRef.bind('click', function () {
ztree.destroy();