some changes

This commit is contained in:
MaksimProgr 2015-02-11 01:20:19 +03:00 committed by Mottie
parent e6db1fadfc
commit a3e53194b0

View File

@ -1167,7 +1167,7 @@ ts.filter = {
// specific columns search // specific columns search
var query = data.anyMatchFilter.split( ts.filter.regex.andSplit ); var query = data.anyMatchFilter.split( ts.filter.regex.andSplit );
console.log(query); var injected = false;
for (var i = 0; i<query.length; i++) { for (var i = 0; i<query.length; i++) {
var res = query[i].split(":"); var res = query[i].split(":");
if (res.length>1) { if (res.length>1) {
@ -1176,11 +1176,14 @@ ts.filter = {
filters[res[0]] = res[1]; filters[res[0]] = res[1];
query.splice(i, 1); query.splice(i, 1);
i--; i--;
injected = true;
} }
} }
} }
if (injected) {
data.anyMatchFilter = query.join(" && "); data.anyMatchFilter = query.join(" && ");
} }
}
// optimize searching only through already filtered rows - see #313 // optimize searching only through already filtered rows - see #313
searchFiltered = wo.filter_searchFiltered; searchFiltered = wo.filter_searchFiltered;