Updated Branches: refs/heads/4.2 1b82ca2a7 -> 7e8234f7f
scale up vm/systemvm/routerVM response handline Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e8234f7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e8234f7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e8234f7 Branch: refs/heads/4.2 Commit: 7e8234f7fe5f4812492c02bae75daca54fc7e9f1 Parents: 1b82ca2 Author: Pranav Saxena <psb...@gmail.com> Authored: Tue Jul 2 15:46:17 2013 +0530 Committer: Pranav Saxena <psb...@gmail.com> Committed: Tue Jul 2 15:46:17 2013 +0530 ---------------------------------------------------------------------- ui/scripts/instances.js | 8 ++++---- ui/scripts/system.js | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e8234f7/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index e9a3d67..f905fa4 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1266,9 +1266,9 @@ dataType: "json", async: true, success: function(json) { - // var jid = json.scalevirtualmachineresponse.jobid; - args.response.success(); - /* {_custom: + var jid = json.scalevirtualmachineresponse.jobid; + args.response.success({ + _custom: {jobId: jid, getUpdatedItem: function(json) { return json.queryasyncjobresultresponse.jobresult.virtualmachine; @@ -1277,7 +1277,7 @@ return vmActionfilter; } } - } */ + }); }, error:function(json){ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e8234f7/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 135307b..75a8e28 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -6507,19 +6507,19 @@ dataType: "json", async: true, success: function(json) { - // var jid = json.scalevirtualmachineresponse.jobid; - args.response.success(); - /* {_custom: + var jid = json.scalevirtualmachineresponse.jobid; + args.response.success({ + _custom: {jobId: jid, getUpdatedItem: function(json) { return json.queryasyncjobresultresponse.jobresult.virtualmachine; }, getActionFilter: function() { - return vmActionfilter; + return systemvmActionfilter; } } - } */ + }); }, error:function(json){ @@ -7428,18 +7428,18 @@ dataType: "json", async: true, success: function(json) { - // var jid = json.scalevirtualmachineresponse.jobid; - args.response.success(); - /* {_custom: + var jid = json.scalevirtualmachineresponse.jobid; + args.response.success({ + _custom: {jobId: jid, getUpdatedItem: function(json) { return json.queryasyncjobresultresponse.jobresult.virtualmachine; }, getActionFilter: function() { - return vmActionfilter; + return routerActionfilter; } } - }*/ + }); }, error:function(json){
