Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BFB3010700 for ; Mon, 22 Jul 2013 23:20:26 +0000 (UTC) Received: (qmail 51556 invoked by uid 500); 22 Jul 2013 23:20:26 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 51533 invoked by uid 500); 22 Jul 2013 23:20:26 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 51526 invoked by uid 99); 22 Jul 2013 23:20:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jul 2013 23:20:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 49BA68B1365; Mon, 22 Jul 2013 23:20:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Mon, 22 Jul 2013 23:20:27 -0000 Message-Id: In-Reply-To: <552716be3b4c4e47be08e872dc04a546@git.apache.org> References: <552716be3b4c4e47be08e872dc04a546@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.2 to df3ae98 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 Authored: Mon Jul 22 16:14:45 2013 -0700 Committer: Brian Federle 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");