visual_condition_builder 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3eccce1ce50046d5d3068dff5fab9d47aec22e5
-  data.tar.gz: 3fa60cbf902a7ae3672d9db5c3a3174f887c5a20
+  metadata.gz: 95f4cbff7a8a8d97381f43c3824224b75a8b21e8
+  data.tar.gz: 20d29c136d3e7611004f7cd795a11dd994fd4186
 SHA512:
-  metadata.gz: df6385f9f9eae40875d0e2a95dc99ca28ecc485c2b62a3ede4b08b839da1a511adfe0ae1acde0835c7c99e0e474c6ebfca8352af9d2bbacffdb4339b32667b25
-  data.tar.gz: eac30cf124a32d36b6399bde28a832168fb32150be4a1a979184c5a22a6cb89ecb8c21002e88ad38a7b003309db32af5aeba6d785b0a8542d32a25363fd6dbb4
+  metadata.gz: da0c65aee9a1c0021e884f6600d5a9518cb415285ce6ed581ce747572b6bc1e09b52e9b138118ffa33fcb5a98e83ddf409dc59c2538201f268586a004b48df0e
+  data.tar.gz: aae2bf4bec11d2b0cc86b743820164c5db16073fc07b72e9f39403564c43ebf2459b10d3fec2ae5d81cef6e8b2725091d6e62db933bb02168bfbccc729e87b8a

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

@@ -194,9 +194,14 @@
                 var field_name = getFieldValue(groupConditions);
                 var operator = getOperator(groupConditions);
                 var value = getValue(groupConditions);
+                var showValue = getValueElement(groupConditions).is(':visible');
 
-                if (!is_blank(field_name) && !is_blank(operator) && !is_blank(value)) {
+                console.log(field_name, operator, value, showValue);
+
+                if (!is_blank(field_name) && !is_blank(operator) && showValue && !is_blank(value)) {
                     data.push([field_name, operator, value]);
+                } else if (!is_blank(field_name) && !is_blank(operator) && !showValue) { //FIELD AND OPERATOR
+                    data.push([field_name, operator]);
                 } else if (!is_blank(field_name) && operator == '' && is_blank(value)) { //FIELD ONLY
                     data.push(field_name);
                 }
@@ -367,17 +372,22 @@
                 var $listUl = $('<ul class="list-unstyled"></ul>');
                 $.each(plugin.parameters.values, function (i, data) {
                     var fieldObj, operatorObj;
-                    if (typeof data == 'object') { //ONLY FIELD
+                    if (typeof data == 'string') { //FIELD ONLY
+                        fieldObj = getFieldByName(data);
+                    } else {
                         fieldObj = getFieldByName(data[0]);
                         operatorObj = getOperatorFromField(data[1], fieldObj.operators);
-                    } else {
-                        fieldObj = getFieldByName(data);
+                        console.log(data, operatorObj)
                     }
+
+                    //RENDER
                     var $listItem = $('<li></li>');
                     $listItem.append('<span class="pr-2">' + getLabel(fieldObj) + '</span>');
                     if (!is_blank(operatorObj)) {
                         $listItem.append('<span class="pr-2">' + getLabel(operatorObj) + '</span>');
-                        $listItem.append('<span class="">' + data[2] + '</span>');
+                        if (typeof data[2] != 'undefined') {
+                            $listItem.append('<span class="">' + data[2] + '</span>');
+                        }
                     }
                     $listItem.appendTo($listUl);
                 });
@@ -390,7 +400,7 @@
             if (!is_blank(plugin.parameters.values) && plugin.parameters.values.length > 0) {
                 $.each(plugin.parameters.values, function (i, data) {
                     var field, operator;
-                    if (typeof data == 'object') { //ONLY FIELD
+                    if (typeof data == 'object') { //FIELD ONLY
                         field = data[0];
                         operator = data[1];
                     } else {

data/lib/visual_condition_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visual_condition_builder
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Bruno Porto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails