Updated Branches: refs/heads/UI-explicitDedication 1b8ab1a38 -> 651864d9b
explicit Dedication - Pod action filter for releasing dedicated pod (API Call) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/651864d9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/651864d9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/651864d9 Branch: refs/heads/UI-explicitDedication Commit: 651864d9b036a3c6f0d324308e6a322ef77d63ee Parents: 1b8ab1a Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Tue May 28 16:52:43 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Tue May 28 16:52:43 2013 +0530 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 6 +++- ui/scripts/system.js | 51 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/651864d9/ui/css/cloudstack3.css ---------------------------------------------------------------------- diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 7f6df22..ef178bd 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -11715,11 +11715,13 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it background-position: 0px -613px; } -.restart .icon { +.restart .icon, +.release .icon { background-position: 0px -63px; } -.restart:hover .icon { +.restart:hover .icon, +.release:hover .icon { background-position: 0px -645px; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/651864d9/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 42a8d36..3d7537e 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -8270,6 +8270,43 @@ }, + release:{ + label:'Release Dedicated Pod', + messages:{ + confirm: function(args) { + return 'Do you want to release this dedicated pod ?'; + }, + notification: function(args) { + return 'Pod dedication released'; + } + }, + action:function(args){ + $.ajax({ + url:createURL("releaseDedicatedPod&podid=" + args.context.pods[0].id), + dataType:"json", + async:true, + success:function(json){ + var jid = json.releasededicatedpodresponse.jobid; + args.response.success({ + _custom: + { jobId: jid + }, + notification: { + poll: pollAsyncJobResult + }, + actionFilter:podActionfilter + + }); + }, + error:function(args){ + args.response.error(parseXMLHttpResponse(XMLHttpResponse)); + } + }); + + } + }, + + disable: { label: 'label.action.disable.pod', messages: { @@ -12228,20 +12265,26 @@ var podActionfilter = function(args) { var podObj = args.context.item; var allowedActions = []; - + var flag = 0; $.ajax({ url:createURL("listDedicatedPods&podId=" + args.context.pods[0].id), success:function(json){ if(json.listdedicatedpodsresponse.dedicatedpod != undefined){ var dedicatedPodObj = json.listdedicatedpodsresponse.dedicatedpod[0]; if(dedicatedPodObj.domainid != null) - allowedActions.push("release"); - } + flag =1; + } else - allowedActions.push("dedicate"); + flag =0; } }); + // if(flag == 0) + allowedActions.push("dedicate"); + + // if(flag == 1) + allowedActions.push("release"); + allowedActions.push("edit"); if(podObj.allocationstate == "Disabled") allowedActions.push("enable");
