You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/01/09 13:36:21 UTC

git commit: AMBARI-4247 Restart marker does not show up sometimes in the Hosts page. (atkach)

Updated Branches:
  refs/heads/trunk 365e8dcdd -> a4011020d


AMBARI-4247 Restart marker does not show up sometimes in the Hosts page. (atkach)


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

Branch: refs/heads/trunk
Commit: a4011020dbd0b483295d68b50d5439ba445563a3
Parents: 365e8dc
Author: atkach <at...@hortonworks.com>
Authored: Thu Jan 9 14:36:19 2014 +0200
Committer: atkach <at...@hortonworks.com>
Committed: Thu Jan 9 14:36:19 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/global/update_controller.js | 2 +-
 ambari-web/app/models/host.js                          | 2 +-
 ambari-web/app/views/main/host.js                      | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a4011020/ambari-web/app/controllers/global/update_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js
index 0c73f03..66bf2d4 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -191,7 +191,7 @@ App.UpdateController = Em.Controller.extend({
   },
   updateComponentConfig: function (callback) {
     var testUrl = '/data/services/host_component_stale_configs.json';
-    var componentConfigUrl = this.getUrl(testUrl, '/host_components?fields=HostRoles/component_name&HostRoles/stale_configs=true');
+    var componentConfigUrl = this.getUrl(testUrl, '/host_components?fields=HostRoles/host_name&HostRoles/stale_configs=true&minimal_response=true');
     App.HttpClient.get(componentConfigUrl, App.componentConfigMapper, {
       complete: callback
     });

http://git-wip-us.apache.org/repos/asf/ambari/blob/a4011020/ambari-web/app/models/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/host.js b/ambari-web/app/models/host.js
index 2985c35..0098211 100644
--- a/ambari-web/app/models/host.js
+++ b/ambari-web/app/models/host.js
@@ -90,7 +90,7 @@ App.Host = DS.Model.extend({
    */
   componentsInMaintenanceCount: function() {
     return this.get('hostComponents').filterProperty('workStatus', App.HostComponentStatus.maintenance).length;
-  }.property('hostsComponents.@each.workStatus').volatile(),
+  }.property('hostComponents.@each.workStatus'),
 
   /**
    * Truncate hostName if it longer than 43 symbols

http://git-wip-us.apache.org/repos/asf/ambari/blob/a4011020/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 43e96e6..1de9f18 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -44,7 +44,6 @@ App.MainHostView = App.TableView.extend({
   didInsertElement: function() {
     this.addObserver('controller.clearFilters', this, this.clearFiltersObs);
     this.clearFiltersObs();
-    this.addObserver('content.@each.hostComponents.@each', this, this.filter);
   },
 
   sortView: sort.wrapperView,
@@ -170,7 +169,7 @@ App.MainHostView = App.TableView.extend({
           }
         }
       }
-    }.property('view.content.@each.healthClass', 'view.content.@each.criticalAlertsCount', 'view.content.@each.componentsInMaintenanceCount', 'view.content.@each.hostComponents.@each.staleConfigs'),
+    }.property('view.content.@each.healthClass', 'view.content.@each.criticalAlertsCount', 'view.content.@each.componentsInMaintenanceCount', 'view.content.@each.componentsWithStaleConfigsCount'),
 
     label: function () {
       return "%@ (%@)".fmt(this.get('value'), this.get('hostsCount'));