ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: Revert "AMBARI-17703 - Hosts page: after component filter hosts have wrong list of components (rzang)"
Date Wed, 02 Nov 2016 22:39:50 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 950d1db87 -> 47b926fae


Revert "AMBARI-17703 - Hosts page: after component filter hosts have wrong list of components
(rzang)"

This reverts commit 7d3bec57ac072a9dd5a04d3cb08219193c484196.


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

Branch: refs/heads/trunk
Commit: 47b926fae8206a76725304c5e4d19201869fdf9a
Parents: 950d1db
Author: Richard Zang <rzang@apache.org>
Authored: Wed Nov 2 15:38:40 2016 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Wed Nov 2 15:39:46 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/47b926fa/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 02f66d1..fda1704 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -366,7 +366,7 @@ App.UpdateController = Em.Controller.extend({
     var preLoadKeys = this.get('hostsPreLoadKeys');
 
     if (this.get('queryParams.Hosts').length > 0 && this.get('queryParams.Hosts').filter(function
(param) {
-      return param.isComponentRelatedFilter;
+      return preLoadKeys.contains(param.key);
     }, this).length > 0) {
       this.getHostByHostComponents(callback);
       return true;
@@ -407,7 +407,7 @@ App.UpdateController = Em.Controller.extend({
       params.callback(skipCall);
     } else {
       queryParams = queryParams.filter(function (param) {
-        return !param.isComponentRelatedFilter;
+        return !preLoadKeys.contains(param.key);
       });
 
       queryParams = [{

http://git-wip-us.apache.org/repos/asf/ambari/blob/47b926fa/ambari-web/app/controllers/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host.js b/ambari-web/app/controllers/main/host.js
index b85ed95..cea40cb 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/ambari-web/app/controllers/main/host.js
@@ -258,8 +258,7 @@ App.MainHostController = Em.ArrayController.extend(App.TableServerMixin,
{
           key: property.key,
           value: filter.value,
           type: property.type,
-          isFilter: true,
-          isComponentRelatedFilter: ([13,15].indexOf(filter.iColumn) != -1)
+          isFilter: true
         };
         if (filter.type === 'string' && sortProperties.someProperty('name', colPropAssoc[filter.iColumn]))
{
           if (Em.isArray(filter.value)) {


Mime
View raw message