ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-7888 Config history table filter strange behavior. (ababiichuk)
Date Tue, 21 Oct 2014 17:25:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk bc0ae7de9 -> 12df0682d


AMBARI-7888 Config history table filter strange behavior. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 12df0682d8390292aa9b99921d0c823bfa2e8693
Parents: bc0ae7d
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Tue Oct 21 20:18:03 2014 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Tue Oct 21 20:23:04 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/messages.js                                 | 1 +
 ambari-web/app/mixins/common/table_server_mixin.js         | 1 +
 ambari-web/app/views/main/dashboard/config_history_view.js | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/12df0682/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 936fe15..2ef3ffa 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2071,6 +2071,7 @@ Em.I18n.translations = {
   'tableView.filters.paginationInfo': '{0} - {1} of {2}',
   'tableView.filters.clearAllFilters': 'clear filters',
   'tableView.filters.showAll': 'Show All',
+  'tableView.filters.filteredConfigVersionInfo': '{0} of {1} versions showing',
 
   'jobs.type':'Jobs Type',
   'jobs.type.hive':'Hive',

http://git-wip-us.apache.org/repos/asf/ambari/blob/12df0682/ambari-web/app/mixins/common/table_server_mixin.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/table_server_mixin.js b/ambari-web/app/mixins/common/table_server_mixin.js
index 41a0bf9..33357ea 100644
--- a/ambari-web/app/mixins/common/table_server_mixin.js
+++ b/ambari-web/app/mixins/common/table_server_mixin.js
@@ -117,6 +117,7 @@ App.TableServerMixin = Em.Mixin.create({
           });
         } else if (filter.type === 'string') {
           property.value = this.getRegExp(filter.value);
+          filterParams.push(property);
         } else {
           property.value = filter.value;
           filterParams.push(property);

http://git-wip-us.apache.org/repos/asf/ambari/blob/12df0682/ambari-web/app/views/main/dashboard/config_history_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/dashboard/config_history_view.js b/ambari-web/app/views/main/dashboard/config_history_view.js
index cd05711..a866ae9 100644
--- a/ambari-web/app/views/main/dashboard/config_history_view.js
+++ b/ambari-web/app/views/main/dashboard/config_history_view.js
@@ -53,7 +53,7 @@ App.MainConfigHistoryView = App.TableView.extend({
    * @returns {String}
    */
   filteredContentInfo: function () {
-    return this.t('hosts.filters.filteredHostsInfo').format(this.get('filteredCount'), this.get('totalCount'));
+    return this.t('tableView.filters.filteredConfigVersionInfo').format(this.get('filteredCount'),
this.get('totalCount'));
   }.property('filteredCount', 'totalCount'),
 
   /**


Mime
View raw message