Updated Branches: refs/heads/UI-explicitDedication 5b2c2109c -> 1b8ab1a38
explicit Dedication - Pod action filter for release/dedicate action items Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b8ab1a3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b8ab1a3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b8ab1a3 Branch: refs/heads/UI-explicitDedication Commit: 1b8ab1a3829b9ebe5a799af71ca4bdf333592dda Parents: 5b2c210 Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Tue May 28 16:00:24 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Tue May 28 16:00:24 2013 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b8ab1a3/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 4755f27..42a8d36 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -12228,8 +12228,21 @@ var podActionfilter = function(args) { var podObj = args.context.item; var allowedActions = []; + + $.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"); + } + else + allowedActions.push("dedicate"); + } + }); + allowedActions.push("edit"); - allowedActions.push("dedicate"); if(podObj.allocationstate == "Disabled") allowedActions.push("enable"); else if(podObj.allocationstate == "Enabled")
