ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-6131. Services page intermittently loaded with empty content. (jaimin)
Date Mon, 16 Jun 2014 18:57:09 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 0843fc809 -> 6433f8892


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6433f889
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6433f889
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6433f889

Branch: refs/heads/trunk
Commit: 6433f889255c4455a7752d78518bfd87d948fca8
Parents: 0843fc8
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Mon Jun 16 11:56:03 2014 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Mon Jun 16 11:56:19 2014 -0700

----------------------------------------------------------------------
 ambari-web/app/views/common/table_view.js | 2 +-
 ambari-web/app/views/main/host.js         | 4 +---
 ambari-web/app/views/main/jobs_view.js    | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6433f889/ambari-web/app/views/common/table_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/table_view.js b/ambari-web/app/views/common/table_view.js
index 1c8620e..7454416 100644
--- a/ambari-web/app/views/common/table_view.js
+++ b/ambari-web/app/views/common/table_view.js
@@ -91,7 +91,7 @@ App.TableView = Em.View.extend(App.UserPref, {
       var childViews = this.get('childViews');
 
       filterConditions.forEach(function(condition) {
-        var view = childViews.findProperty('column', condition.iColumn);
+        var view = !Em.isNone(condition.iColumn) && childViews.findProperty('column',
condition.iColumn);
         if (view) {
           view.set('value', condition.value);
           Em.run.next(function() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/6433f889/ambari-web/app/views/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host.js b/ambari-web/app/views/main/host.js
index 544361e..7aa6ec6 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -100,11 +100,9 @@ App.MainHostView = App.TableView.extend(App.TableServerProvider, {
     this._super();
     var filterConditions = App.db.getFilterConditions(this.get('controller.name'));
     if (filterConditions) {
-
       var childViews = this.get('childViews');
-
       filterConditions.forEach(function(condition) {
-        var view = childViews.findProperty('column', condition.iColumn);
+        var view = !Em.isNone(condition.iColumn) && childViews.findProperty('column',
condition.iColumn);
         if (view) {
           view.set('value', condition.value);
           Em.run.next(function() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/6433f889/ambari-web/app/views/main/jobs_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/jobs_view.js b/ambari-web/app/views/main/jobs_view.js
index aae49fb..ea6cec9 100644
--- a/ambari-web/app/views/main/jobs_view.js
+++ b/ambari-web/app/views/main/jobs_view.js
@@ -55,7 +55,7 @@ App.MainJobsView = App.TableView.extend({
       var childViews = this.get('childViews');
 
       filterConditions.forEach(function(condition) {
-        var view = childViews.findProperty('column', condition.iColumn);
+        var view = !Em.isNone(condition.iColumn) && childViews.findProperty('column',
condition.iColumn);
         if (view) {
           //self.get('controller.filterObject').set(colPropAssoc[condition.iColumn], condition.value);
           view.set('value', condition.value);
@@ -333,4 +333,4 @@ App.MainJobsView = App.TableView.extend({
     return (this.get("controller.navIDs.backIDs").length > 1);
   }.property('controller.navIDs.backIDs.[].length')
 
-})
+});


Mime
View raw message