visual_condition_builder 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af2cb5d937b9857357b882cd71845d480bd4eab
-  data.tar.gz: 905d1f6ecb357906d67e3372444fc654da04125b
+  metadata.gz: a3eccce1ce50046d5d3068dff5fab9d47aec22e5
+  data.tar.gz: 3fa60cbf902a7ae3672d9db5c3a3174f887c5a20
 SHA512:
-  metadata.gz: 560146be3d2b940d6d56504b787e0f442c43e8cd4cdddf2e92ab2dfdb38694affebdc96bda35f0abbb33d41a4f9184c22c939c05bc0d0c61ea03606a6841fa78
-  data.tar.gz: 95cf175b786168e48ae2405c10752c924da653be1639ccc05f0cea08df1706400e7dff57a122a288c394687a4d8199e58622f1d262738014f5c6df9ef3ef31ce
+  metadata.gz: df6385f9f9eae40875d0e2a95dc99ca28ecc485c2b62a3ede4b08b839da1a511adfe0ae1acde0835c7c99e0e474c6ebfca8352af9d2bbacffdb4339b32667b25
+  data.tar.gz: eac30cf124a32d36b6399bde28a832168fb32150be4a1a979184c5a22a6cb89ecb8c21002e88ad38a7b003309db32af5aeba6d785b0a8542d32a25363fd6dbb4

data/app/assets/javascripts/visual_condition_builder/condition_builder.js

@@ -194,8 +194,11 @@
                 var field_name = getFieldValue(groupConditions);
                 var operator = getOperator(groupConditions);
                 var value = getValue(groupConditions);
+
                 if (!is_blank(field_name) && !is_blank(operator) && !is_blank(value)) {
                     data.push([field_name, operator, value]);
+                } else if (!is_blank(field_name) && operator == '' && is_blank(value)) { //FIELD ONLY
+                    data.push(field_name);
                 }
             });
             if (typeof plugin.result === 'function') {
@@ -363,12 +366,19 @@
             if (!is_blank(plugin.parameters.values) && plugin.parameters.values.length > 0) {
                 var $listUl = $('<ul class="list-unstyled"></ul>');
                 $.each(plugin.parameters.values, function (i, data) {
-                    var fieldObj = getFieldByName(data[0]);
-                    var operatorObj = getOperatorFromField(data[1], fieldObj.operators);
+                    var fieldObj, operatorObj;
+                    if (typeof data == 'object') { //ONLY FIELD
+                        fieldObj = getFieldByName(data[0]);
+                        operatorObj = getOperatorFromField(data[1], fieldObj.operators);
+                    } else {
+                        fieldObj = getFieldByName(data);
+                    }
                     var $listItem = $('<li></li>');
                     $listItem.append('<span class="pr-2">' + getLabel(fieldObj) + '</span>');
-                    $listItem.append('<span class="pr-2">' + getLabel(operatorObj) + '</span>');
-                    $listItem.append('<span class="">' + data[2] + '</span>');
+                    if (!is_blank(operatorObj)) {
+                        $listItem.append('<span class="pr-2">' + getLabel(operatorObj) + '</span>');
+                        $listItem.append('<span class="">' + data[2] + '</span>');
+                    }
                     $listItem.appendTo($listUl);
                 });
                 $element.append($listUl);
@@ -379,9 +389,15 @@
             $element.find('.conditions').html('');
             if (!is_blank(plugin.parameters.values) && plugin.parameters.values.length > 0) {
                 $.each(plugin.parameters.values, function (i, data) {
-                    var field = data[0];
+                    var field, operator;
+                    if (typeof data == 'object') { //ONLY FIELD
+                        field = data[0];
+                        operator = data[1];
+                    } else {
+                        field = data;
+                    }
                     var groupConditions = plugin.add_condition(field);
-                    if (typeof groupConditions != 'undefined') {
+                    if (typeof groupConditions != 'undefined' && !is_blank(operator)) {
                         var groupConditionId = groupConditions.attr('data-id');
                         plugin.fill_condition(groupConditionId, data);
                     }
@@ -555,7 +571,7 @@
         }; //END normalize_operators
 
         var is_blank = function (value) {
-            return (value === undefined || value === null || value === [] || value === '')
+            return (typeof value == 'undefined' || value == null || value == [] || value == '')
         }; //END is_blank
 
         var flatten = function (arrays) {

data/lib/visual_condition_builder/version.rb

@@ -1,3 +1,3 @@
 module VisualConditionBuilder
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visual_condition_builder
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Bruno Porto