You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/10/31 19:27:48 UTC
ambari git commit: AMBARI-18749. Hosts paging works incorrectly with
service and component filters (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 0dfc3377d -> 166e87816
AMBARI-18749. Hosts paging works incorrectly with service and component filters (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/166e8781
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/166e8781
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/166e8781
Branch: refs/heads/trunk
Commit: 166e87816e20399df14b36bc5c250f74996cba23
Parents: 0dfc337
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Oct 31 17:38:25 2016 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Oct 31 21:27:43 2016 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/global/update_controller.js | 4 ++--
ambari-web/app/views/common/table_view.js | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/166e8781/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 da10e00..02f66d1 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -410,11 +410,11 @@ App.UpdateController = Em.Controller.extend({
return !param.isComponentRelatedFilter;
});
- queryParams.push({
+ queryParams = [{
key: 'Hosts/host_name',
value: hostNames,
type: 'MULTIPLE'
- });
+ }];
params.callback(skipCall, queryParams);
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/166e8781/ambari-web/app/views/common/table_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/table_view.js b/ambari-web/app/views/common/table_view.js
index abdd4ed..543be03 100644
--- a/ambari-web/app/views/common/table_view.js
+++ b/ambari-web/app/views/common/table_view.js
@@ -373,6 +373,7 @@ App.TableView = Em.View.extend(App.UserPref, {
type: type
};
this.get('filterConditions').push(filterCondition);
+ this.propertyDidChange('showFilteredContent');
}
this.saveAllFilterConditions();
@@ -526,4 +527,4 @@ App.TableView = Em.View.extend(App.UserPref, {
});
}
-});
\ No newline at end of file
+});