ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: AMBARI-17703 - Hosts page: after component filter hosts have wrong list of components (rzang)
Date Thu, 14 Jul 2016 20:07:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c09eeac1f -> 7d3bec57a


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


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

Branch: refs/heads/trunk
Commit: 7d3bec57ac072a9dd5a04d3cb08219193c484196
Parents: c09eeac
Author: Richard Zang <rzang@apache.org>
Authored: Thu Jul 14 12:32:38 2016 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Thu Jul 14 13:06:25 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/7d3bec57/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 98f528f..e179a2a 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 preLoadKeys.contains(param.key);
+      return param.isComponentRelatedFilter;
     }, 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 !preLoadKeys.contains(param.key);
+        return !param.isComponentRelatedFilter;
       });
 
       queryParams.push({

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


Mime
View raw message