commit 4fe3a7172f26b3677920aed8b6eb940f1b19d404
author Oleg Nechiporenko <cv_github@yahoo.com> Fri Nov 22 16:08:00 2013 +0200
committer Oleg Nechiporenko <cv_github@yahoo.com> Fri Nov 22 16:15:05 2013 +0200
tree a771fa625c656f5b81043f7e4a97876ea0f21817
parent a4dee94c54209f5714e2a0a1beee6af99317a394

AMBARI-3857. Clicking on Settings link navigates to login page for a non-admin user. (onechiporenko)

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 @@
   },
 
   showSettingsPopup: function() {
+    // Settings only for admins
+    if (!App.get('isAdmin')) return;
+
     var self = this;
     var curValue = null;
     this.dataLoading().done(function (initValue) {

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}}&nbsp;<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>