Skip to content

Commit 58cc9ed

Browse files
committed
Return true or false correctly from formIsValid #6898
1 parent b88abd3 commit 58cc9ed

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

ui/js/dfv/src/pods-dfv.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ window.PodsDFV = {
606606
* @param {int|null} itemId Object ID. (Optional.)
607607
* @param {int|null} formCounter Form index. (Optional.)
608608
*
609-
* @return {string[]|undefined} List of validation messages, or undefined if not found.
609+
* @return {Object.<string, string[]>} Returns field names as keys and arrays of validation messages as values.
610610
*/
611611
getValidationMessages( pod = null, itemId = null, formCounter = null ) {
612612
const form = this.detectForm(
@@ -625,9 +625,6 @@ window.PodsDFV = {
625625
// Get validation messages.
626626
const validationMessages = form.stored.getValidationMessages();
627627

628-
// Debug output for validation messages for now. @todo Remove this.
629-
console.log( { validationMessages } );
630-
631628
return validationMessages;
632629
},
633630

@@ -647,7 +644,16 @@ window.PodsDFV = {
647644
return undefined;
648645
}
649646

650-
return 0 === validationMessages.length;
647+
if ( 0 === Object.keys( validationMessages ).length ) {
648+
return false;
649+
}
650+
651+
return Object.values( validationMessages ).every( ( messages ) => {
652+
if ( 0 !== messages.length ) {
653+
return false;
654+
}
655+
return true;
656+
} );
651657
},
652658

653659
/**

0 commit comments

Comments
 (0)