etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6229: UI > Delete Host action > if hypervisor is XenServer, display 'The host has been deleted. Please eject the host from XenServer Pool'.

This commit is contained in:
Jessica Wang 2014-03-11 15:15:17 -07:00
parent 3e097a0fb2
commit e7ad33c456
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/scripts/system.js
View File

@ -14762,9 +14762,9 @@
return 'label.action.remove.host';
}
},
preFilter: function (args) {
if (isAdmin()) {
args.$form.find('.form-item[rel=isForced]').css('display', 'inline-block');
preFilter: function(args) { //bug to fix: preFilter is not picked up from here
if (!isAdmin()) {
args.$form.find('.form-item[rel=isForced]').hide();
}
},
createForm: {
@ -14774,25 +14774,33 @@
isForced: {
label: 'force.remove',
isBoolean: true,
isHidden: true
isHidden: false
}
}
},
action: function (args) {
var array1 =[];
//if(args.$form.find('.form-item[rel=isForced]').css("display") != "none") //uncomment after Brian fix it to include $form in args
array1.push("&forced=" + (args.data.isForced == "on"));
var data = {
id: args.context.hosts[0].id
};
if(args.$form.find('.form-item[rel=isForced]').css("display") != "none") {
$.extend(data, {
forced: (args.data.isForced == "on")
});
}
$.ajax({
url: createURL("deleteHost&id=" + args.context.hosts[0].id + array1.join("")),
dataType: "json",
async: true,
url: createURL("deleteHost"),
data: data,
success: function (json) {
//{ "deletehostresponse" : { "success" : "true"} }
args.response.success({
data: {
}
});
if (args.context.hosts[0].hypervisor == "XenServer"){
cloudStack.dialog.notice({ message: _s("The host has been deleted. Please eject the host from XenServer Pool") })
}
}
});
},