瀏覽代碼

AMBARI-7080. Empty views dropdown in main menu doesn't show 'No Views' message. (akovalenko)

Aleksandr Kovalenko 11 年之前
父節點
當前提交
7ec3d3ba47
共有 2 個文件被更改,包括 3 次插入5 次删除
  1. 2 4
      ambari-web/app/templates/main/menu_item.hbs
  2. 1 1
      ambari-web/app/views/main/menu.js

+ 2 - 4
ambari-web/app/templates/main/menu_item.hbs

@@ -39,11 +39,9 @@
 {{/if}}
 {{#if view.isViewsItem}}
   <ul class="top-nav-dropdown-menu">
-    {{#if view.content.views}}
+    {{#if view.content.views.length}}
       {{#each category in view.content.views}}
-        {{#if category.visible }}
-          <li><a href="#" {{action "setView" category target="App.router.mainViewsController"}}>{{category.label}}</a></li>
-        {{/if}}
+        <li><a href="#" {{action "setView" category target="App.router.mainViewsController"}}>{{category.label}}</a></li>
       {{/each}}
     {{else}}
       <li class="disabled"><a href="javascript:void(null);">{{t menu.item.views.noViews}}</a></li>

+ 1 - 1
ambari-web/app/views/main/menu.js

@@ -57,7 +57,7 @@ App.MainMenuView = Em.CollectionView.extend({
       }
 
       if (App.supports.views) {
-        result.push({ label:Em.I18n.t('menu.item.views'), routing:'views.index', isView:true, views: this.get('views')});
+        result.push({ label:Em.I18n.t('menu.item.views'), routing:'views.index', isView:true, views: this.get('views').filterProperty('visible')});
       }
 
     }