You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/11/22 23:55:50 UTC
[2/3] git commit: AMBARI-3857. Clicking on Settings link navigates to
login page for a non-admin user. (onechiporenko)
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/7eadedc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/7eadedc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/7eadedc1
Branch: refs/heads/branch-1.4.2
Commit: 7eadedc18f50d9a29d257b0c52aa81d75acb25d8
Parents: 03962d0
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Fri Nov 22 16:08:00 2013 +0200
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Fri Nov 22 14:55:14 2013 -0800
----------------------------------------------------------------------
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/7eadedc1/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/7eadedc1/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}} <span class="caret"></span>
</button>
<ul class="dropdown-menu">
- <li><a href="" {{action showSettingsPopup target="controller"}}>{{t app.settings}}</a></li>
+ {{#if App.isAdmin}}
+ <li><a href="" {{action showSettingsPopup target="controller"}}>{{t app.settings}}</a></li>
+ {{/if}}
<li><a href="" {{action logoff}}>{{t app.signout}}</a></li>
</ul>
</div>