Merge pull request #17 from saicheck2233/new_ValidateRadioButton

Enhancement: Add validation support for radio button
saicheck2233 · Jul 11, 2023 · 95805e3 · 95805e3
2 parents 7453938 + 11b181a
commit 95805e3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/js/brutusin-json-forms-bootstrap.js b/src/js/brutusin-json-forms-bootstrap.js
@@ -250,6 +250,14 @@ if (("undefined" === typeof $ || "undefined" === typeof $.fn || "undefined" ===
     BrutusinForms.onValidationError = function (element, message) {
 
         setTimeout(function () {
+            if (element.tagName === "DIV" && element.childElementCount !== 0) {
+                for (var i = 0; i < element.childElementCount; i++) {
+                    if (element.childNodes[i].tagName === "INPUT") {
+                        element = element.childNodes[i];
+                        break;
+                    }
+                }
+            }
             var dataToggle = element.getAttribute("data-toggle");
             var dataTrigger = element.getAttribute("data-trigger");
             var dataContent = element.getAttribute("data-content");

diff --git a/src/js/brutusin-json-forms.js b/src/js/brutusin-json-forms.js
@@ -418,6 +418,20 @@ if (typeof brutusin === "undefined") {
                     input.selectedIndex = 2;
                 }
             }
+
+            input.getValidationError = function () {
+                try {
+                    var value = getValue(s, input);
+                    if (value === null) {
+                        if (s.required) {
+                            return BrutusinForms.messages["required"];
+                        }
+                    } 
+                } catch (error) {
+                    return BrutusinForms.messages["invalidValue"];
+                }
+            };
+
             input.onchange = function () {
                 if (parentObject) {
                     parentObject[propertyProvider.getValue()] = getValue(s, input);