cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.2 to 3c05999
Date Thu, 01 Aug 2013 20:42:31 GMT
Updated Branches:
  refs/heads/4.2 5384cbc41 -> 3c0599935


CLOUDSTACK-3713: UI > Infrastructure menu > System VMs > Scale Up action: call scaleSystemVm
API instead of scaleVirtualMachine API.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3c059993
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3c059993
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3c059993

Branch: refs/heads/4.2
Commit: 3c05999354526d6c31035de333df3a203a0f70a4
Parents: 5384cbc
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Aug 1 13:40:58 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Aug 1 13:42:21 2013 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c059993/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a156a37..15352f3 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6923,16 +6923,16 @@
 
                                                         action: function(args) {
                                                             $.ajax({
-                                                                url: createURL("scaleVirtualMachine&id="
+ args.context.systemVMs[0].id + "&serviceofferingid=" + args.data.serviceOfferingId),
+                                                                url: createURL("scaleSystemVm&id="
+ args.context.systemVMs[0].id + "&serviceofferingid=" + args.data.serviceOfferingId),
                                                                 dataType: "json",
                                                                 async: true,
                                                                 success: function(json) {
-                                                                    var jid = json.scalevirtualmachineresponse.jobid;
+                                                                    var jid = json.changeserviceforsystemvmresponse.jobid;
                                                                     args.response.success({
                                                                         _custom: {
                                                                             jobId: jid,
                                                                             getUpdatedItem:
function(json) {
-                                                                                return json.queryasyncjobresultresponse.jobresult.virtualmachine;
+                                                                                return json.queryasyncjobresultresponse.jobresult.systemvm;
                                                                             },
                                                                             getActionFilter:
function() {
                                                                                 return systemvmActionfilter;
@@ -7951,16 +7951,16 @@
 
                                 action: function(args) {
                                     $.ajax({
-                                        url: createURL("scaleVirtualMachine&id=" + args.context.routers[0].id
+ "&serviceofferingid=" + args.data.serviceOfferingId),
+                                        url: createURL("scaleSystemVm&id=" + args.context.routers[0].id
+ "&serviceofferingid=" + args.data.serviceOfferingId),
                                         dataType: "json",
                                         async: true,
                                         success: function(json) {
-                                            var jid = json.scalevirtualmachineresponse.jobid;
+                                            var jid = json.changeserviceforsystemvmresponse.jobid;
                                             args.response.success({
                                                 _custom: {
                                                     jobId: jid,
                                                     getUpdatedItem: function(json) {
-                                                        return json.queryasyncjobresultresponse.jobresult.virtualmachine;
+                                                        return json.queryasyncjobresultresponse.jobresult.systemvm;
                                                     },
                                                     getActionFilter: function() {
                                                         return routerActionfilter;
@@ -8570,16 +8570,16 @@
 
                                 action: function(args) {
                                     $.ajax({
-                                        url: createURL("scaleVirtualMachine&id=" + args.context.systemVMs[0].id
+ "&serviceofferingid=" + args.data.serviceOfferingId),
+                                        url: createURL("scaleSystemVm&id=" + args.context.systemVMs[0].id
+ "&serviceofferingid=" + args.data.serviceOfferingId),
                                         dataType: "json",
                                         async: true,
                                         success: function(json) {
-                                            var jid = json.scalevirtualmachineresponse.jobid;
+                                            var jid = json.changeserviceforsystemvmresponse.jobid;
                                             args.response.success({
                                                 _custom: {
                                                     jobId: jid,
                                                     getUpdatedItem: function(json) {
-                                                        return json.queryasyncjobresultresponse.jobresult.virtualmachine;
+                                                        return json.queryasyncjobresultresponse.jobresult.systemvm;
                                                     },
                                                     getActionFilter: function() {
                                                         return vmActionfilter;


Mime
View raw message