Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
96ec5fac
Commit
96ec5fac
authored
Aug 06, 2018
by
BaiJiangJie
Committed by
老广
Aug 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 更新 xpack/orgs 删除功能:限制在当前org下删除当前org (#1645)
parent
de3695bf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
jumpserver.js
apps/static/js/jumpserver.js
+9
-4
No files found.
apps/static/js/jumpserver.js
View file @
96ec5fac
...
...
@@ -179,7 +179,7 @@ function APIUpdateAttr(props) {
toastr
.
error
(
fail_message
);
}
if
(
typeof
props
.
error
===
'function'
)
{
return
props
.
error
(
jqXHR
.
responseText
);
return
props
.
error
(
jqXHR
.
responseText
,
jqXHR
.
status
);
}
});
// return true;
...
...
@@ -234,8 +234,13 @@ function orgDelete(obj, name, url, redirectTo){
window
.
location
.
href
=
redirectTo
;
}
};
var
fail
=
function
()
{
swal
(
"错误"
,
"[ "
+
name
+
" ] 组织中存在未删除信息,请删除后重试"
,
"error"
);
var
fail
=
function
(
responseText
,
status
)
{
if
(
status
===
400
){
swal
(
"错误"
,
"[ "
+
name
+
" ] 组织中包含未删除信息,请删除后重试"
,
"error"
);
}
else
if
(
status
===
405
){
swal
(
"错误"
,
"请勿在组织 [ "
+
name
+
" ] 下执行此操作,切换到其他组织后重试"
,
"error"
);
}
};
APIUpdateAttr
({
url
:
url
,
...
...
@@ -247,7 +252,7 @@ function orgDelete(obj, name, url, redirectTo){
});
}
swal
({
title
:
"请
先删除组织内的以下信息:
"
,
title
:
"请
确保组织内的以下信息已删除
"
,
text
:
"用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权规则"
,
type
:
"warning"
,
showCancelButton
:
true
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment