You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/07/12 21:16:13 UTC
[1/2] git commit: updated refs/heads/master to 05ff190
Updated Branches:
refs/heads/4.2 f9fd13203 -> 77b738f58
refs/heads/master 59e65e840 -> 05ff19031
CLOUDSTACK-2615: Remove 'change service' from VM actions
Now that scaleVirtualMachine is being used to change compute
offerings, the old 'change service' action can be removed, as it will
be deprecated in the future.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05ff1903
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05ff1903
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05ff1903
Branch: refs/heads/master
Commit: 05ff190314027c80c92c0370e89552cd47787282
Parents: 59e65e8
Author: Brian Federle <br...@citrix.com>
Authored: Fri Jul 12 12:15:50 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Jul 12 12:15:50 2013 -0700
----------------------------------------------------------------------
ui/scripts/instances.js | 59 --------------------------------------------
1 file changed, 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05ff1903/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 7928c68..9b27d93 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -926,65 +926,6 @@
}
},
- changeService: {
- label: 'label.action.change.service',
- messages: {
- notification: function(args) {
- return 'label.action.change.service';
- }
- },
- createForm: {
- title: 'label.action.change.service',
- desc: '',
- fields: {
- serviceOffering: {
- label: 'label.compute.offering',
- select: function(args) {
- $.ajax({
- url: createURL("listServiceOfferings&VirtualMachineId=" + args.context.instances[0].id),
- dataType: "json",
- async: true,
- success: function(json) {
- var serviceofferings = json.listserviceofferingsresponse.serviceoffering;
- var items = [];
- $(serviceofferings).each(function() {
- items.push({id: this.id, description: this.name});
- });
- args.response.success({data: items});
- }
- });
- }
- }
- }
- },
-
- preAction: function(args) {
- var jsonObj = args.context.instances[0];
- if (jsonObj.state != 'Stopped') {
- cloudStack.dialog.notice({ message: 'message.action.change.service.warning.for.instance' });
- return false;
- }
- return true;
- },
-
- action: function(args) {
- $.ajax({
- url: createURL("changeServiceForVirtualMachine&id=" + args.context.instances[0].id + "&serviceOfferingId=" + args.data.serviceOffering),
- dataType: "json",
- async: true,
- success: function(json) {
- var jsonObj = json.changeserviceforvirtualmachineresponse.virtualmachine;
- args.response.success({data: jsonObj});
- }
- });
- },
- notification: {
- poll: function(args) {
- args.complete();
- }
- }
- },
-
createTemplate: {
label: 'label.create.template',
messages: {
[2/2] git commit: updated refs/heads/4.2 to 77b738f
Posted by bf...@apache.org.
CLOUDSTACK-2615: Remove 'change service' from VM actions
Now that scaleVirtualMachine is being used to change compute
offerings, the old 'change service' action can be removed, as it will
be deprecated in the future.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/77b738f5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/77b738f5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/77b738f5
Branch: refs/heads/4.2
Commit: 77b738f58c471b22fe54ff830b3dacd098906e93
Parents: f9fd132
Author: Brian Federle <br...@citrix.com>
Authored: Fri Jul 12 12:15:50 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Jul 12 12:16:03 2013 -0700
----------------------------------------------------------------------
ui/scripts/instances.js | 59 --------------------------------------------
1 file changed, 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77b738f5/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 7928c68..9b27d93 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -926,65 +926,6 @@
}
},
- changeService: {
- label: 'label.action.change.service',
- messages: {
- notification: function(args) {
- return 'label.action.change.service';
- }
- },
- createForm: {
- title: 'label.action.change.service',
- desc: '',
- fields: {
- serviceOffering: {
- label: 'label.compute.offering',
- select: function(args) {
- $.ajax({
- url: createURL("listServiceOfferings&VirtualMachineId=" + args.context.instances[0].id),
- dataType: "json",
- async: true,
- success: function(json) {
- var serviceofferings = json.listserviceofferingsresponse.serviceoffering;
- var items = [];
- $(serviceofferings).each(function() {
- items.push({id: this.id, description: this.name});
- });
- args.response.success({data: items});
- }
- });
- }
- }
- }
- },
-
- preAction: function(args) {
- var jsonObj = args.context.instances[0];
- if (jsonObj.state != 'Stopped') {
- cloudStack.dialog.notice({ message: 'message.action.change.service.warning.for.instance' });
- return false;
- }
- return true;
- },
-
- action: function(args) {
- $.ajax({
- url: createURL("changeServiceForVirtualMachine&id=" + args.context.instances[0].id + "&serviceOfferingId=" + args.data.serviceOffering),
- dataType: "json",
- async: true,
- success: function(json) {
- var jsonObj = json.changeserviceforvirtualmachineresponse.virtualmachine;
- args.response.success({data: jsonObj});
- }
- });
- },
- notification: {
- poll: function(args) {
- args.complete();
- }
- }
- },
-
createTemplate: {
label: 'label.create.template',
messages: {