Author: yusaku
Date: Fri Jan 11 03:16:16 2013
New Revision: 1431851
URL: http://svn.apache.org/viewvc?rev=1431851&view=rev
Log:
AMBARI-1158. Fiters are not working correctly on Hosts page. (yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/utils/data_table.js
incubator/ambari/trunk/ambari-web/app/views/main/host.js
Modified: incubator/ambari/trunk/ambari-web/app/utils/data_table.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/data_table.js?rev=1431851&r1=1431850&r2=1431851&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/data_table.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/data_table.js Fri Jan 11
03:16:16 2013
@@ -220,7 +220,8 @@ jQuery.extend($.fn.dataTableExt.afnFilte
match = false;
rowValue = (jQuery(rowValue).text()) ? jQuery(rowValue).text() :
rowValue;
for (var i = 0; i < options.length; i++) {
- if (rowValue.indexOf(options[i]) !== -1) match = true;
+ var str = new RegExp('(\\W|^)' + options[i] + '(\\W|$)');
+ if (rowValue.search(str) !== -1) match = true;
}
}
Modified: incubator/ambari/trunk/ambari-web/app/views/main/host.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/host.js?rev=1431851&r1=1431850&r2=1431851&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/host.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/host.js Fri Jan 11
03:16:16 2013
@@ -46,6 +46,7 @@ App.MainHostView = Em.View.extend({
"bSortCellsTop": true,
"iDisplayLength": 10,
"aLengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]],
+ "oSearch": {"bSmart":false},
"aoColumns":[
{ "bSortable": false },
{ "sType":"html" },
