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 A2EEE17CAA for ; Thu, 23 Oct 2014 23:19:15 +0000 (UTC) Received: (qmail 98651 invoked by uid 500); 23 Oct 2014 23:19:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 98615 invoked by uid 500); 23 Oct 2014 23:19: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 98605 invoked by uid 99); 23 Oct 2014 23:19: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, 23 Oct 2014 23:19:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C8BA61FDCB; Thu, 23 Oct 2014 23:19:14 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.5 to 793a007 Date: Thu, 23 Oct 2014 23:19:14 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.5 974adb39c -> 793a007e1 CLOUDSTACK-7779: UI > affinity group action filter > extend scope from local to global. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/793a007e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/793a007e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/793a007e Branch: refs/heads/4.5 Commit: 793a007e12bc8ff15fc051b3bf0fd83b6547f1fa Parents: 974adb3 Author: Jessica Wang Authored: Thu Oct 23 15:46:25 2014 -0700 Committer: Jessica Wang Committed: Thu Oct 23 16:19:04 2014 -0700 ---------------------------------------------------------------------- ui/scripts/affinity.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/793a007e/ui/scripts/affinity.js ---------------------------------------------------------------------- diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js index 3f354cd..4f579e1 100644 --- a/ui/scripts/affinity.js +++ b/ui/scripts/affinity.js @@ -207,7 +207,7 @@ } }; - var affinitygroupActionfilter = function(args) { + var affinitygroupActionfilter = cloudStack.actionFilter.affinitygroupActionfilter = function(args) { var jsonObj = args.context.item; var allowedActions = []; if (jsonObj.type != 'ExplicitDedication' || isAdmin()) {