You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2016/03/01 01:41:06 UTC
ambari git commit: AMBARI-15236 Combo Search: Implement "core",
"ram" filters (Joe Wang via rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk e175f770f -> 93bdd5eeb
AMBARI-15236 Combo Search: Implement "core", "ram" filters (Joe Wang via rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93bdd5ee
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93bdd5ee
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93bdd5ee
Branch: refs/heads/trunk
Commit: 93bdd5eebf4fffcd09c4c8d140f2d78a14951507
Parents: e175f77
Author: Richard Zang <rz...@apache.org>
Authored: Mon Feb 29 16:40:29 2016 -0800
Committer: Richard Zang <rz...@apache.org>
Committed: Mon Feb 29 16:40:29 2016 -0800
----------------------------------------------------------------------
ambari-web/app/mixins/common/table_server_view_mixin.js | 9 ++++++++-
ambari-web/app/views/main/host/combo_search_box.js | 2 ++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/93bdd5ee/ambari-web/app/mixins/common/table_server_view_mixin.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/table_server_view_mixin.js b/ambari-web/app/mixins/common/table_server_view_mixin.js
index b126efa..cb26367 100644
--- a/ambari-web/app/mixins/common/table_server_view_mixin.js
+++ b/ambari-web/app/mixins/common/table_server_view_mixin.js
@@ -107,11 +107,18 @@ App.TableServerViewMixin = Em.Mixin.create({
filterCondition.value.push(filterValue);
}
} else {
+ var type = 'string';
+ if (tag.category === 'cpu') {
+ type = 'number';
+ }
+ if (tag.category === 'memoryFormatted') {
+ type = 'ambari-bandwidth';
+ }
filterCondition = {
skipFilter: false,
iColumn: iColumn,
value: filterValue,
- type: 'string'
+ type: type
};
self.get('filterConditions').push(filterCondition);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/93bdd5ee/ambari-web/app/views/main/host/combo_search_box.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/combo_search_box.js b/ambari-web/app/views/main/host/combo_search_box.js
index 86f0c2f..dc5b6d1 100644
--- a/ambari-web/app/views/main/host/combo_search_box.js
+++ b/ambari-web/app/views/main/host/combo_search_box.js
@@ -47,6 +47,8 @@ App.MainHostComboSearchBoxView = Em.View.extend({
{label: 'IP', value: 'ip', category: 'Host'},
{label: 'Heath Status', value: 'healthClass', category: 'Host'},
{label: 'Stack Version', value: 'version', category: 'Host'},
+ {label: 'Cores', value: 'cpu', category: 'Host'},
+ {label: 'RAM', value: 'memoryFormatted', category: 'Host'},
{label: 'Version State', value: 'versionState', category: 'Host'},
{label: 'Rack', value: 'rack', category: 'Host'},
{label: 'Service', value: 'services', category: 'Service'},