diff --git a/src/data.js b/src/data.js index 304f8341..6e00ea31 100644 --- a/src/data.js +++ b/src/data.js @@ -405,7 +405,8 @@ QueryBuilder.prototype.getRuleInputValue = function(rule) { value.push(tmp); } else { - value.push($value.find('[name=' + name + '] option:selected').val()); + // value.push($value.find('[name=' + name + '] option:selected').val()); + value.push($value.find('[name=' + name + ']').val()); } break; diff --git a/src/plugins/sql-support/plugin.js b/src/plugins/sql-support/plugin.js index 95b7eda5..d8de997f 100644 --- a/src/plugins/sql-support/plugin.js +++ b/src/plugins/sql-support/plugin.js @@ -343,7 +343,9 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ { */ var field = self.change('getSQLField', rule.field, rule); - var ruleExpression = field + ' ' + sqlFn(value); + var ruleExpression = rule.type === 'string' && (rule.input === 'text' || rule.input === 'select') ? + 'LOWER(' + field + ')' + sqlFn('LOWER(' + value + ')') : + field + ' ' + sqlFn(value); /** * Modifies the SQL generated for a rule diff --git a/src/template.js b/src/template.js index 004d4693..1b5d5864 100644 --- a/src/template.js +++ b/src/template.js @@ -49,12 +49,28 @@ QueryBuilder.templates.rule = '\
\ '; +// QueryBuilder.templates.filterSelect = '\ +// {{ var optgroup = null; }} \ +// '; + QueryBuilder.templates.filterSelect = '\ {{ var optgroup = null; }} \ -'; +'; QueryBuilder.templates.operatorSelect = '\ {{? it.operators.length === 1 }} \ @@ -87,9 +103,28 @@ QueryBuilder.templates.operatorSelect = '\ {{? optgroup !== null }}{{?}} \ '; +// QueryBuilder.templates.ruleValueSelect = '\ +// {{ var optgroup = null; }} \ +// '; + QueryBuilder.templates.ruleValueSelect = '\ {{ var optgroup = null; }} \ -'; +'; /** * Returns group's HTML