Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F0A2010ACD for ; Fri, 22 Nov 2013 14:15:15 +0000 (UTC) Received: (qmail 51736 invoked by uid 500); 22 Nov 2013 14:15:15 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 51609 invoked by uid 500); 22 Nov 2013 14:15:12 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 51583 invoked by uid 99); 22 Nov 2013 14:15:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Nov 2013 14:15:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 07211901D65; Fri, 22 Nov 2013 14:15:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: onechiporenko@apache.org To: ambari-commits@incubator.apache.org Date: Fri, 22 Nov 2013 14:15:10 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: AMBARI-3857. Clicking on Settings link navigates to login page for a non-admin user. (onechiporenko) Updated Branches: refs/heads/trunk a4dee94c5 -> c33215607 AMBARI-3857. Clicking on Settings link navigates to login page for a non-admin user. (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/4fe3a717 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/4fe3a717 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/4fe3a717 Branch: refs/heads/trunk Commit: 4fe3a7172f26b3677920aed8b6eb940f1b19d404 Parents: a4dee94 Author: Oleg Nechiporenko Authored: Fri Nov 22 16:08:00 2013 +0200 Committer: Oleg Nechiporenko Committed: Fri Nov 22 16:15:05 2013 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/application.js | 3 +++ ambari-web/app/templates/application.hbs | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4fe3a717/ambari-web/app/controllers/application.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/application.js b/ambari-web/app/controllers/application.js index ab079b4..ef72985 100644 --- a/ambari-web/app/controllers/application.js +++ b/ambari-web/app/controllers/application.js @@ -107,6 +107,9 @@ App.ApplicationController = Em.Controller.extend({ }, showSettingsPopup: function() { + // Settings only for admins + if (!App.get('isAdmin')) return; + var self = this; var curValue = null; this.dataLoading().done(function (initValue) { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4fe3a717/ambari-web/app/templates/application.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs index ee3c46d..2eb986b 100644 --- a/ambari-web/app/templates/application.hbs +++ b/ambari-web/app/templates/application.hbs @@ -44,7 +44,9 @@ {{App.router.loginName}}