瀏覽代碼

AMBARI-6895 Log in with different users cause wrong list of available views.(Buzhor Denys via atkach)

atkach 10 年之前
父節點
當前提交
620978b611
共有 2 個文件被更改,包括 5 次插入2 次删除
  1. 2 0
      ambari-web/app/controllers/global/cluster_controller.js
  2. 3 2
      ambari-web/app/views/main/menu.js

+ 2 - 0
ambari-web/app/controllers/global/cluster_controller.js

@@ -364,6 +364,8 @@ App.ClusterController = Em.Controller.extend({
         sender: this,
         sender: this,
         success: 'loadViewInstancesSuccess'
         success: 'loadViewInstancesSuccess'
       });
       });
+    } else {
+      this.set('ambariViews', []);
     }
     }
   },
   },
 
 

+ 3 - 2
ambari-web/app/views/main/menu.js

@@ -30,7 +30,7 @@ App.MainMenuView = Em.CollectionView.extend({
     return App.router.get('clusterController.ambariViews');
     return App.router.get('clusterController.ambariViews');
   }.property('App.router.clusterController.ambariViews'),
   }.property('App.router.clusterController.ambariViews'),
 
 
-  content:function(){
+  content: function(){
     var result = [];
     var result = [];
     if (App.router.get('loggedIn')) {
     if (App.router.get('loggedIn')) {
 
 
@@ -62,7 +62,8 @@ App.MainMenuView = Em.CollectionView.extend({
 
 
     }
     }
     return result;
     return result;
-  }.property('App.router.loggedIn', 'App.router.clusterController.isLoaded', 'App.supports.views', 'App.supports.mirroring', 'App.supports.secureCluster', 'App.supports.highAvailability'),
+  }.property('App.router.loggedIn', 'App.router.clusterController.isLoaded', 'App.supports.views', 'App.supports.mirroring',
+      'App.supports.secureCluster', 'App.supports.highAvailability', 'views.length'),
 
 
     /**
     /**
      *    Adds observer on lastSetURL and calls navigation sync procedure
      *    Adds observer on lastSetURL and calls navigation sync procedure