Add support to validate array fields using non array rules

proengsoft · Jan 7, 2017 · 4bf612a · 4bf612a
1 parent 88576f3
commit 4bf612a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/resources/assets/js/helpers.js b/resources/assets/js/helpers.js
@@ -78,16 +78,26 @@ $.extend(true, laravelValidation, {
             }
 
             var validator = $.data(element.form, "validator");
-            var objRules = validator.settings.rules[element.name];
-            if ('laravelValidation' in objRules) {
-                var _rules=objRules.laravelValidation;
-                for (var i = 0; i < _rules.length; i++) {
-                    if ($.inArray(_rules[i][0],rules) !== -1) {
-                        found = true;
-                        break;
+            var listRules = [];
+            if (element.name in validator.arrayRulesCache) {
+                $.each(validator.arrayRulesCache[element.name], function (index, arrayRule) {
+                    listRules.push(arrayRule);
+                });
+            }
+            if (element.name in validator.settings.rules) {
+                listRules.push(validator.settings.rules[element.name]);
+            }
+            $.each(listRules, function(index,objRules){
+                if ('laravelValidation' in objRules) {
+                    var _rules=objRules.laravelValidation;
+                    for (var i = 0; i < _rules.length; i++) {
+                        if ($.inArray(_rules[i][0],rules) !== -1) {
+                            found = true;
+                            return false;
+                        }
                     }
                 }
-            }
+            });
 
             return found;
         },

diff --git a/resources/assets/js/jsvalidation.js b/resources/assets/js/jsvalidation.js
@@ -52,6 +52,9 @@ laravelValidation = {
             } else {
                 cache[element.name][name]={};
                 var nameParts = name.split("[*]");
+                if (nameParts.length==1) {
+                    nameParts.push('');
+                }
                 var regexpParts = nameParts.map(function(currentValue, index) {
                     if (index % 2 === 0) {
                         currentValue = currentValue + '[';