Bladeren bron

AMBARI-6131. Services page intermittently loaded with empty content. (jaimin)

Jaimin Jetly 11 jaren geleden
bovenliggende
commit
6433f88925

+ 1 - 1
ambari-web/app/views/common/table_view.js

@@ -91,7 +91,7 @@ App.TableView = Em.View.extend(App.UserPref, {
       var childViews = this.get('childViews');
       var childViews = this.get('childViews');
 
 
       filterConditions.forEach(function(condition) {
       filterConditions.forEach(function(condition) {
-        var view = childViews.findProperty('column', condition.iColumn);
+        var view = !Em.isNone(condition.iColumn) && childViews.findProperty('column', condition.iColumn);
         if (view) {
         if (view) {
           view.set('value', condition.value);
           view.set('value', condition.value);
           Em.run.next(function() {
           Em.run.next(function() {

+ 1 - 3
ambari-web/app/views/main/host.js

@@ -100,11 +100,9 @@ App.MainHostView = App.TableView.extend(App.TableServerProvider, {
     this._super();
     this._super();
     var filterConditions = App.db.getFilterConditions(this.get('controller.name'));
     var filterConditions = App.db.getFilterConditions(this.get('controller.name'));
     if (filterConditions) {
     if (filterConditions) {
-
       var childViews = this.get('childViews');
       var childViews = this.get('childViews');
-
       filterConditions.forEach(function(condition) {
       filterConditions.forEach(function(condition) {
-        var view = childViews.findProperty('column', condition.iColumn);
+        var view = !Em.isNone(condition.iColumn) && childViews.findProperty('column', condition.iColumn);
         if (view) {
         if (view) {
           view.set('value', condition.value);
           view.set('value', condition.value);
           Em.run.next(function() {
           Em.run.next(function() {

+ 2 - 2
ambari-web/app/views/main/jobs_view.js

@@ -55,7 +55,7 @@ App.MainJobsView = App.TableView.extend({
       var childViews = this.get('childViews');
       var childViews = this.get('childViews');
 
 
       filterConditions.forEach(function(condition) {
       filterConditions.forEach(function(condition) {
-        var view = childViews.findProperty('column', condition.iColumn);
+        var view = !Em.isNone(condition.iColumn) && childViews.findProperty('column', condition.iColumn);
         if (view) {
         if (view) {
           //self.get('controller.filterObject').set(colPropAssoc[condition.iColumn], condition.value);
           //self.get('controller.filterObject').set(colPropAssoc[condition.iColumn], condition.value);
           view.set('value', condition.value);
           view.set('value', condition.value);
@@ -333,4 +333,4 @@ App.MainJobsView = App.TableView.extend({
     return (this.get("controller.navIDs.backIDs").length > 1);
     return (this.get("controller.navIDs.backIDs").length > 1);
   }.property('controller.navIDs.backIDs.[].length')
   }.property('controller.navIDs.backIDs.[].length')
 
 
-})
+});