#2810

diff --git a/src/app/Magic/Fields/Number.php b/src/app/Magic/Fields/Number.php
index aa3135e42c8b18f9e0ad32e23abc3dddfa7249df..88c09c97ba4c0ad0e9f9296c01c46667c4efa220 100644 (file)
--- a/src/app/Magic/Fields/Number.php
+++ b/src/app/Magic/Fields/Number.php
@@ -12,11 +12,12 @@ class Number extends Field
     protected $_step = 'any';
     protected $_min = null;
     protected $_max = null;
+    protected $_lang = 'en-150';
 
     public function getDefaultAttributes()
     {
         $res = parent::getDefaultAttributes();
-        $attrs = ['min', 'max', 'step'];
+        $attrs = ['min', 'max', 'step', 'lang'];
         $defaults = [];
         foreach ($attrs as $attr) {
             if (null === $this->{'_' . $attr}) {

diff --git a/src/resources/views/when.blade.php b/src/resources/views/when.blade.php
index 3ae6a7808b57554badaf685576f6e6ebc305d925..ed64fc0aa54529463d32e78cfe246875339e9f18 100644 (file)
--- a/src/resources/views/when.blade.php
+++ b/src/resources/views/when.blade.php
@@ -13,6 +13,9 @@
                     var conditions = $(this).data('when');
                     var match = true;
                     $.each(conditions, function (k, v) {
+                        if (!Array.isArray(v)) {
+                            v = [v];
+                        }
                         var val = $(form).find('[name="' + k + '"]').val();
                         var valnum = parseFloat(val);
                         if (!isNumber(valnum)) {