浏览代码

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

Oleg Nechiporenko 11 年之前
父节点
当前提交
4fe3a7172f
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 3 0
      ambari-web/app/controllers/application.js
  2. 3 1
      ambari-web/app/templates/application.hbs

+ 3 - 0
ambari-web/app/controllers/application.js

@@ -107,6 +107,9 @@ App.ApplicationController = Em.Controller.extend({
   },
   },
 
 
   showSettingsPopup: function() {
   showSettingsPopup: function() {
+    // Settings only for admins
+    if (!App.get('isAdmin')) return;
+
     var self = this;
     var self = this;
     var curValue = null;
     var curValue = null;
     this.dataLoading().done(function (initValue) {
     this.dataLoading().done(function (initValue) {

+ 3 - 1
ambari-web/app/templates/application.hbs

@@ -44,7 +44,9 @@
                 {{App.router.loginName}}&nbsp;<span class="caret"></span>
                 {{App.router.loginName}}&nbsp;<span class="caret"></span>
               </button>
               </button>
               <ul class="dropdown-menu">
               <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>
                 <li><a href="" {{action logoff}}>{{t app.signout}}</a></li>
               </ul>
               </ul>
             </div>
             </div>