Repository: ambari Updated Branches: refs/heads/branch-2.4 d3cf46b0d -> 8e21cf417
Revert "AMBARI-17703 - Hosts page: after component filter hosts have wrong list of components (rzang)" This reverts commit 0d477f96c35cf619560ff4542d6069bb45d409e8. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e21cf41 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e21cf41 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e21cf41 Branch: refs/heads/branch-2.4 Commit: 8e21cf417d6e41bfa40d643ad4be5c62e4ed6ef2 Parents: d3cf46b Author: Richard Zang <[email protected]> Authored: Thu Nov 3 13:18:16 2016 -0700 Committer: Richard Zang <[email protected]> Committed: Thu Nov 3 13:18:16 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/8e21cf41/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/8e21cf41/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)) {
