Merge pull request #122 from legalthings/required_checkbox_does_not_w…

…ork_for_option_groups Fix validation of group fields
legalthings · Dec 6, 2018 · 2c72f5c · 2c72f5c
2 parents ee774b2 + b7ec94a
commit 2c72f5c
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/js/legalform-validation.js b/js/legalform-validation.js
@@ -2,10 +2,11 @@
  * Validation for LegalForm
  */
 (function($) {
-    function LegalFormValidation() {
+    function LegalFormValidation(isTestEnv) {
         this.ractive = null;
         this.el = null;
         this.elWizard = null;
+        this.isTestEnv = !!isTestEnv;
 
         //Fields for custom validation
         var textFields = 'input[type="text"], input[type="number"], input[type="email"], textarea';
@@ -228,25 +229,26 @@
             }
 
             // Implement validation for group checkboxes
-            if (meta.type === 'group') {
+            if (meta.type === 'group' && $input.attr('multiple')) {
                 const checkBoxId = $input.attr('data-id');
-                const allCheckboxes = $("[data-id='" + checkBoxId + "']");
+                const $allCheckboxes = $('[data-id="' + checkBoxId + '"]');
                 const isRequired = !$input.closest('.form-group').find('label > span').length ? false :
                     $input.closest('.form-group').find('label > span')[0].className === 'required' ? true : false;
 
-                let checked = 0;
-
-                for (var i = 0; i < allCheckboxes.length; i++) {
-                    if (allCheckboxes[i].checked) {
-                        checked++;
-                    } else if (allCheckboxes[i].type !== 'radio') {
-                        $(allCheckboxes[i]).prop('required', false);
+                if (isRequired && this.isTestEnv) {
+                    $allCheckboxes.prop('required', false);
+                } else {
+                    let checked = 0;
+                    for (var i = 0; i < $allCheckboxes.length; i++) {
+                        if ($allCheckboxes[i].checked) checked++;
                     }
-                }
 
-                if (isRequired && checked === 0) {
-                    $input.get(0).setCustomValidity(error);
-                    return;
+                    if (isRequired) $allCheckboxes.prop('required', !checked);
+
+                    if (isRequired && checked === 0) {
+                        $input.get(0).setCustomValidity(error);
+                        return;
+                    }
                 }
             }