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/23 01:20:26 UTC
[1/2] git commit: updated refs/heads/master to c9fdee8
Updated Branches:
refs/heads/4.2 5d9fa5d42 -> df3ae9805
refs/heads/master db8b9ea53 -> c9fdee8f2
CLOUDSTACK-3710: Remove over-commit ratio fields from edit cluster UI
Removes over-commit fields as editable. This also removes the 'edit
cluster' action, as there are no longer any fields to edit.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c9fdee8f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c9fdee8f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c9fdee8f
Branch: refs/heads/master
Commit: c9fdee8f212a327f53cd845268a2de131fc2a3e9
Parents: db8b9ea
Author: Brian Federle <br...@citrix.com>
Authored: Mon Jul 22 16:14:45 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Jul 22 16:20:04 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9fdee8f/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f4f4047..a56397e 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -11300,21 +11300,12 @@
action: function(args) {
var array1 = [];
- if (args.data.cpuovercommitratio != "" && args.data.cpuovercommitratio > 0)
- array1.push("&cpuovercommitratio=" + args.data.cpuovercommitratio);
-
- if (args.data.memoryovercommitratio != "" && args.data.memoryovercommitratio > 0)
- array1.push("&memoryovercommitratio=" + args.data.memoryovercommitratio);
-
$.ajax({
-
url: createURL("updateCluster&id=" + args.context.clusters[0].id + array1.join("")),
dataType: "json",
async: true,
success: function(json) {
var item = json.updateclusterresponse.cluster;
- args.context.clusters[0].cpuovercommitratio = item.cpuovercommitratio;
- args.context.clusters[0].memoryovercommitratio = item.memoryovercommitratio;
addExtraPropertiesToClusterObject(item);
args.response.success({
actionFilter: clusterActionfilter,
@@ -16319,12 +16310,12 @@
if (jsonObj.state == "Enabled") { //managed, allocation enabled
allowedActions.push("unmanage");
allowedActions.push("disable");
- allowedActions.push("edit");
+ //allowedActions.push("edit"); // No fields to edit
} else if (jsonObj.state == "Disabled") { //managed, allocation disabled
allowedActions.push("unmanage");
allowedActions.push("enable");
- allowedActions.push("edit");
+ //allowedActions.push("edit"); // No fields to edit
} else { //Unmanaged, PrepareUnmanaged , PrepareUnmanagedError
allowedActions.push("manage");
[2/2] git commit: updated refs/heads/4.2 to df3ae98
Posted by bf...@apache.org.
CLOUDSTACK-3710: Remove over-commit ratio fields from edit cluster UI
Removes over-commit fields as editable. This also removes the 'edit
cluster' action, as there are no longer any fields to edit.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df3ae980
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df3ae980
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df3ae980
Branch: refs/heads/4.2
Commit: df3ae980545499e4e1cdc15576623ca34419d57e
Parents: 5d9fa5d
Author: Brian Federle <br...@citrix.com>
Authored: Mon Jul 22 16:14:45 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Mon Jul 22 16:20:17 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df3ae980/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 75ab2a6..047612d 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -11299,21 +11299,12 @@
action: function(args) {
var array1 = [];
- if (args.data.cpuovercommitratio != "" && args.data.cpuovercommitratio > 0)
- array1.push("&cpuovercommitratio=" + args.data.cpuovercommitratio);
-
- if (args.data.memoryovercommitratio != "" && args.data.memoryovercommitratio > 0)
- array1.push("&memoryovercommitratio=" + args.data.memoryovercommitratio);
-
$.ajax({
-
url: createURL("updateCluster&id=" + args.context.clusters[0].id + array1.join("")),
dataType: "json",
async: true,
success: function(json) {
var item = json.updateclusterresponse.cluster;
- args.context.clusters[0].cpuovercommitratio = item.cpuovercommitratio;
- args.context.clusters[0].memoryovercommitratio = item.memoryovercommitratio;
addExtraPropertiesToClusterObject(item);
args.response.success({
actionFilter: clusterActionfilter,
@@ -16318,12 +16309,12 @@
if (jsonObj.state == "Enabled") { //managed, allocation enabled
allowedActions.push("unmanage");
allowedActions.push("disable");
- allowedActions.push("edit");
+ //allowedActions.push("edit"); // No fields to edit
} else if (jsonObj.state == "Disabled") { //managed, allocation disabled
allowedActions.push("unmanage");
allowedActions.push("enable");
- allowedActions.push("edit");
+ //allowedActions.push("edit"); // No fields to edit
} else { //Unmanaged, PrepareUnmanaged , PrepareUnmanagedError
allowedActions.push("manage");