wait #6661 @0.25

diff --git a/src/resources/views/when.blade.php b/src/resources/views/when.blade.php
index 4bdb8befc46f99e7230b40ea21525d74a429efdf..99d17ec34e133b2b7af248de862694b5ae51d4d1 100644 (file)
--- a/src/resources/views/when.blade.php
+++ b/src/resources/views/when.blade.php
@@ -81,14 +81,21 @@
             };
 
             function checkCondition(condition, operator, val) {
-                if (condition.id === '_not_empty_' || condition.operator === 'not_empty') {
-                    return val.toString().length > 0;
-                }
-                if (operator === '=') {
-                    return condition.id == val;
-                }
-                if (operator === '!=' || operator === '!') {
-                    return condition.id != val;
+                try {
+                    if (condition.id === undefined) {
+                        condition.id = '';
+                    }
+                    if (condition.id === '_not_empty_' || condition.operator === 'not_empty') {
+                        return val.toString().length > 0;
+                    }
+                    if (operator === '=') {
+                        return condition.id == val;
+                    }
+                    if (operator === '!=' || operator === '!') {
+                        return condition.id != val;
+                    }
+                } catch (e) {
+                    return true;
                 }
             }
 
@@ -125,6 +132,9 @@
                         if (!isObject(condition)) {
                             condition = {id: condition};
                         }
+                        if (!condition.hasOwnProperty('id')) {
+                            condition.id = '';
+                        }
                         if (!condition.hasOwnProperty('order')) {
                             condition.order = k;
                         }