Fix #626 Add "disable_template" option for plugins invert, not-group, sortable

Author: mistic100

src/plugins/invert/plugin.js

@@ -29,25 +29,36 @@ QueryBuilder.define('invert', function(options) {
     });
 
     // Modify templates
-    this.on('getGroupTemplate.filter', function(h, level) {
-        var $h = $(h.value);
-        $h.find(Selectors.condition_container).after('<button type="button" class="btn btn-xs btn-default" data-invert="group"><i class="' + options.icon + '"></i> ' + self.translate('invert') + '</button>');
-        h.value = $h.prop('outerHTML');
-    });
-
-    if (options.display_rules_button && options.invert_rules) {
-        this.on('getRuleTemplate.filter', function(h) {
+    if (!options.disable_template) {
+        this.on('getGroupTemplate.filter', function(h) {
             var $h = $(h.value);
-            $h.find(Selectors.rule_actions).prepend('<button type="button" class="btn btn-xs btn-default" data-invert="rule"><i class="' + options.icon + '"></i> ' + self.translate('invert') + '</button>');
+            $h.find(Selectors.condition_container).after(
+                '<button type="button" class="btn btn-xs btn-default" data-invert="group">' +
+                '<i class="' + options.icon + '"></i> ' + self.translate('invert') +
+                '</button>'
+            );
             h.value = $h.prop('outerHTML');
         });
+
+        if (options.display_rules_button && options.invert_rules) {
+            this.on('getRuleTemplate.filter', function(h) {
+                var $h = $(h.value);
+                $h.find(Selectors.rule_actions).prepend(
+                    '<button type="button" class="btn btn-xs btn-default" data-invert="rule">' +
+                    '<i class="' + options.icon + '"></i> ' + self.translate('invert') +
+                    '</button>'
+                );
+                h.value = $h.prop('outerHTML');
+            });
+        }
     }
 }, {
     icon: 'glyphicon glyphicon-random',
     recursive: true,
     invert_rules: true,
     display_rules_button: false,
-    silent_fail: false
+    silent_fail: false,
+    disable_template: false
 });
 
 QueryBuilder.defaults({

src/plugins/not-group/plugin.js

@@ -30,15 +30,17 @@ QueryBuilder.define('not-group', function(options) {
     });
 
     // Modify templates
-    this.on('getGroupTemplate.filter', function(h, level) {
-        var $h = $(h.value);
-        $h.find(QueryBuilder.selectors.condition_container).prepend(
-            '<button type="button" class="btn btn-xs btn-default" data-not="group">' +
-            '<i class="' + options.icon_unchecked + '"></i> ' + self.translate('NOT') +
-            '</button>'
-        );
-        h.value = $h.prop('outerHTML');
-    });
+    if (!options.disable_template) {
+        this.on('getGroupTemplate.filter', function(h) {
+            var $h = $(h.value);
+            $h.find(QueryBuilder.selectors.condition_container).prepend(
+                '<button type="button" class="btn btn-xs btn-default" data-not="group">' +
+                '<i class="' + options.icon_unchecked + '"></i> ' + self.translate('NOT') +
+                '</button>'
+            );
+            h.value = $h.prop('outerHTML');
+        });
+    }
 
     // Export "not" to JSON
     this.on('groupToJson.filter', function(e, group) {
@@ -94,7 +96,8 @@ QueryBuilder.define('not-group', function(options) {
     });
 }, {
     icon_unchecked: 'glyphicon glyphicon-unchecked',
-    icon_checked: 'glyphicon glyphicon-check'
+    icon_checked: 'glyphicon glyphicon-check',
+    disable_template: false
 });
 
 /**

src/plugins/sortable/plugin.js

@@ -146,23 +146,26 @@ QueryBuilder.define('sortable', function(options) {
     });
 
     // Modify templates
-    this.on('getGroupTemplate.filter', function(h, level) {
-        if (level > 1) {
+    if (!options.disable_template) {
+        this.on('getGroupTemplate.filter', function(h, level) {
+            if (level > 1) {
+                var $h = $(h.value);
+                $h.find(QueryBuilder.selectors.condition_container).after('<div class="drag-handle"><i class="' + options.icon + '"></i></div>');
+                h.value = $h.prop('outerHTML');
+            }
+        });
+
+        this.on('getRuleTemplate.filter', function(h) {
             var $h = $(h.value);
-            $h.find(QueryBuilder.selectors.condition_container).after('<div class="drag-handle"><i class="' + options.icon + '"></i></div>');
+            $h.find(QueryBuilder.selectors.rule_header).after('<div class="drag-handle"><i class="' + options.icon + '"></i></div>');
             h.value = $h.prop('outerHTML');
-        }
-    });
-
-    this.on('getRuleTemplate.filter', function(h) {
-        var $h = $(h.value);
-        $h.find(QueryBuilder.selectors.rule_header).after('<div class="drag-handle"><i class="' + options.icon + '"></i></div>');
-        h.value = $h.prop('outerHTML');
-    });
+        });
+    }
 }, {
     inherit_no_sortable: true,
     inherit_no_drop: true,
-    icon: 'glyphicon glyphicon-sort'
+    icon: 'glyphicon glyphicon-sort',
+    disable_template: false
 });
 
 QueryBuilder.selectors.rule_and_group_containers = QueryBuilder.selectors.rule_container + ', ' + QueryBuilder.selectors.group_container;

tests/index.html

@@ -27,6 +27,7 @@
   <script src="../bower_components/sql-parser/browser/sql-parser.js"></script>
   <script src="../bower_components/jquery-extendext/jQuery.extendext.min.js"></script>
   <script src="../bower_components/doT/doT.js"></script>
+  <script src="../bower_components/interact/dist/interact.js"></script>
 
   <script src="common.js"></script>
 

tests/plugins-gui.module.js

@@ -203,4 +203,35 @@ $(function(){
             'Rule should contain a new button enabled with Bootbox'
         );
     });
+
+    /**
+     * Test sortable
+     */
+    QUnit.test('sortable', function(assert) {
+        $b.queryBuilder({
+            filters: basic_filters,
+            rules: basic_rules,
+            plugins: ['sortable']
+        });
+
+        assert.ok(
+            $b.find('.drag-handle').length > 0,
+            'Should add the drag handles'
+        );
+
+        $b.queryBuilder('destroy');
+
+        $b.queryBuilder({
+            plugins: {
+                'sortable': {disable_template: true}
+            },
+            filters: basic_filters,
+            rules: basic_rules
+        });
+
+        assert.ok(
+            $b.find('.drag-handle').length === 0,
+            'Should not have added the handles with disable_template=true'
+        );
+    });
 });

tests/plugins.module.js

@@ -138,6 +138,21 @@ $(function(){
             },
             'Should have inverted all conditions and operators'
         );
+
+        $b.queryBuilder('destroy');
+
+        $b.queryBuilder({
+            plugins: {
+                invert: {disable_template: true}
+            },
+            filters: basic_filters,
+            rules: basic_rules
+        });
+
+        assert.ok(
+            $b.find('[data-invert="group"]').length === 0,
+            'Should not have added the button with disable_template=true'
+        );
     });
 
     /**

tests/plugins.not-group.module.js

@@ -30,6 +30,21 @@ $(function () {
             $b.queryBuilder('getRules').not,
             'The root json should have "not" flag set to true'
         );
+
+        $b.queryBuilder('destroy');
+
+        $b.queryBuilder({
+            plugins: {
+                'not-group': {disable_template: true}
+            },
+            filters: basic_filters,
+            rules: basic_rules
+        });
+
+        assert.ok(
+            $b.find('[data-not="group"]').length === 0,
+            'Should not have added the button with disable_template=true'
+        );
     });
 
     QUnit.test('SQL export', function (assert) {