From a182fd5bd9b45313f5e836ea3fb507fee758b1c5 Mon Sep 17 00:00:00 2001 From: ghybs Date: Wed, 7 Mar 2018 13:29:02 +0400 Subject: [PATCH 1/2] Fix(search): accept column.searchable as boolean --- lib/builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/builder.js b/lib/builder.js index 0c1c2b4..45069ed 100644 --- a/lib/builder.js +++ b/lib/builder.js @@ -149,7 +149,7 @@ module.exports = function (options) { customColumns = _u.isArray(self.aSearchColumns) && !_u.isEmpty(self.aSearchColumns) && global; _u.each(customColumns ? self.aSearchColumns : requestQuery.columns, function(column){ - if (customColumns || column.searchable === 'true'){ + if (customColumns || (typeof column.searchable === 'boolean' && column.searchable) || column.searchable === 'true'){ var colName = sanitize(customColumns ? column : column.name), searchVal = sanitize(global ? requestQuery.search.value : column.search.value); From 8e339f4221144cb5b19feb2988d60a3a9d13b54e Mon Sep 17 00:00:00 2001 From: ghybs Date: Wed, 7 Mar 2018 13:29:31 +0400 Subject: [PATCH 2/2] Fix(order): accept column.orderable as boolean --- lib/builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/builder.js b/lib/builder.js index 45069ed..2b7269f 100644 --- a/lib/builder.js +++ b/lib/builder.js @@ -196,7 +196,7 @@ module.exports = function (options) { var order = requestQuery.order[fdx], column = requestQuery.columns[order.column]; - if (column.orderable === 'true' && column.name) { + if (((typeof column.orderable === 'boolean' && column.orderable) || column.orderable === 'true') && column.name) { query.push(column.name + " " + order.dir); } }