Fix #543 use "default_value" in setRules method

Author: mistic100

examples/index.html

@@ -546,7 +546,7 @@ <h3>Output</h3>
         }, {
           id: 'coord',
           operator: 'equal',
-          value: 'B.3'
+          value: undefined // will use filter's default value
         }]
       }, {
         id: 'name',

src/core.js

@@ -618,13 +618,7 @@ QueryBuilder.prototype.createRuleOperators = function(rule) {
 
     // set the operator without triggering update event
     if (rule.filter.default_operator) {
-        rule.__.operator = operators.filter(function(operator) {
-            return operator.type === rule.filter.default_operator;
-        })[0];
-
-        if (!rule.__.operator) {
-            Utils.error('Config', 'Invalid operator {0}', rule.filter.default_operator);
-        }
+        rule.__.operator = this.getOperatorByType(rule.filter.default_operator);
     }
     else {
         rule.__.operator = operators[0];

src/public.js

@@ -410,17 +410,22 @@ QueryBuilder.prototype.setRules = function(data, options) {
 
                 if (!item.empty) {
                     model.filter = self.getFilterById(item.id, !options.allow_invalid);
+                }
 
-                    if (model.filter) {
-                        model.operator = self.getOperatorByType(item.operator, !options.allow_invalid);
+                if (model.filter) {
+                    model.operator = self.getOperatorByType(item.operator, !options.allow_invalid);
 
-                        if (!model.operator) {
-                            model.operator = self.getOperators(model.filter)[0];
-                        }
+                    if (!model.operator) {
+                        model.operator = self.getOperators(model.filter)[0];
+                    }
+                }
 
-                        if (model.operator && model.operator.nb_inputs !== 0 && item.value !== undefined) {
-                            model.value = item.value;
-                        }
+                if (model.operator && model.operator.nb_inputs !== 0) {
+                    if (item.value !== undefined) {
+                        model.value = item.value;
+                    }
+                    else if (model.filter.default_value !== undefined) {
+                        model.value = model.filter.default_value;
                     }
                 }
 

tests/data.module.js

@@ -517,6 +517,35 @@ $(function() {
         );
     });
 
+    QUnit.test('apply default value', function(assert) {
+        $b.queryBuilder({
+            filters: [
+                {
+                    id: 'name',
+                    default_value: 'Mistic'
+                }
+            ],
+            rules: [
+                {
+                    id: 'name'
+                }
+            ]
+        });
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            {
+                condition: 'AND',
+                rules: [{
+                    id: 'name',
+                    operator: 'equal',
+                    value: 'Mistic'
+                }]
+            },
+            'Should have used the filter default value'
+        );
+    });
+
     /**
      * Test allow_empty_value option
      */