You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/04/24 01:10:21 UTC

svn commit: r1471196 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/views/main/host.js

Author: yusaku
Date: Tue Apr 23 23:10:21 2013
New Revision: 1471196

URL: http://svn.apache.org/r1471196
Log:
AMBARI-1997. Filtered hosts get out of sync with the filter selection. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/views/main/host.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1471196&r1=1471195&r2=1471196&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Apr 23 23:10:21 2013
@@ -774,6 +774,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1997. Filtered hosts get out of sync with the filter selection. (yusaku)
+
  AMBARI-2009. task-log4j.properties file ownership should not be
  root. (smohanty)
 

Modified: incubator/ambari/trunk/ambari-web/app/views/main/host.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host.js?rev=1471196&r1=1471195&r2=1471196&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host.js Tue Apr 23 23:10:21 2013
@@ -28,23 +28,15 @@ App.MainHostView = App.TableView.extend(
   }.property('controller.content.length'),
 
   didInsertElement:function () {
-    this.filter();
+    this._super();
     if (this.get('controller.comeWithAlertsFilter')) {
       this.set('controller.comeWithAlertsFilter', false);
       this.set('controller.filteredByAlerts', true);
     } else {
       this.set('controller.filteredByAlerts', false);
     }
-    this.tooltipsUpdate();
   },
 
-  tooltipsUpdate: function () {
-    Ember.run.next(function(){
-      $("[rel='HealthTooltip']").tooltip();
-      $("[rel='UsageTooltip']").tooltip();
-    });
-  }.observes('controller.content.length'),
-
   sortView: sort.wrapperView,
   nameSort: sort.fieldView.extend({
     name:'publicHostName',
@@ -77,6 +69,9 @@ App.MainHostView = App.TableView.extend(
   HostView:Em.View.extend({
     content:null,
     tagName: 'tr',
+    didInsertElement: function(){
+      this.$("[rel='HealthTooltip'], [rel='UsageTooltip']").tooltip();
+    },
     shortLabels: function() {
       var labels = this.get('content.hostComponents').getEach('displayName');
       var shortLabels = '';