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 83A8B10BD9 for ; Thu, 15 Aug 2013 01:01:15 +0000 (UTC) Received: (qmail 11772 invoked by uid 500); 15 Aug 2013 01:01:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 11749 invoked by uid 500); 15 Aug 2013 01:01:15 -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 11739 invoked by uid 99); 15 Aug 2013 01:01:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 01:01:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 30140836A7D; Thu, 15 Aug 2013 01:01:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: <6a67ccf8960847b9876f9128e1432474@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 7dd653d Date: Thu, 15 Aug 2013 01:01:15 +0000 (UTC) Updated Branches: refs/heads/master fc202bcfd -> 7dd653d24 CLOUDSTACK-4302: UI > affinity group > hide delete action when affinity group type is ExplicitDedication for regular user. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7dd653d2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7dd653d2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7dd653d2 Branch: refs/heads/master Commit: 7dd653d24a6001a0718c73ef815d12194151f1e8 Parents: fc202bc Author: Jessica Wang Authored: Wed Aug 14 17:58:39 2013 -0700 Committer: Jessica Wang Committed: Wed Aug 14 18:01:04 2013 -0700 ---------------------------------------------------------------------- ui/scripts/affinity.js | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7dd653d2/ui/scripts/affinity.js ---------------------------------------------------------------------- diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js index a491c91..b0011ae 100644 --- a/ui/scripts/affinity.js +++ b/ui/scripts/affinity.js @@ -194,6 +194,7 @@ success: function(json) { var item = json.listaffinitygroupsresponse.affinitygroup[0]; args.response.success({ + actionFilter: affinitygroupActionfilter, data: item }); } @@ -204,4 +205,14 @@ } } }; + + var affinitygroupActionfilter = function(args) { + var jsonObj = args.context.item; + var allowedActions = []; + if (jsonObj.type != 'ExplicitDedication' || isAdmin()) { + allowedActions.push("remove"); + } + return allowedActions; + } + })(cloudStack);