From a0382ad179a15dbd5ccd3071bf2d89be77cf1b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Fri, 27 Aug 2021 07:37:09 +0800 Subject: [PATCH] Fixed the JavaScript form validation logic from isValid && validateXxx() to validateXxx() && isValid, in order to correctly validate multiple fields at once. --- accounting/static/accounting/js/account-form.js | 4 ++-- .../static/accounting/js/transaction-form.js | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/accounting/static/accounting/js/account-form.js b/accounting/static/accounting/js/account-form.js index 77c0737..fe7e976 100644 --- a/accounting/static/accounting/js/account-form.js +++ b/accounting/static/accounting/js/account-form.js @@ -97,8 +97,8 @@ function updateParent(code) { */ function validateForm() { let isValid = true; - isValid = isValid && validateCode(); - isValid = isValid && validateTitle(); + isValid = validateCode() && isValid; + isValid = validateTitle() && isValid; return isValid; } diff --git a/accounting/static/accounting/js/transaction-form.js b/accounting/static/accounting/js/transaction-form.js index 90d141c..0e1b6d8 100644 --- a/accounting/static/accounting/js/transaction-form.js +++ b/accounting/static/accounting/js/transaction-form.js @@ -338,26 +338,26 @@ function resetRecordButtons() { */ function validateForm() { let isValid = true; - isValid = isValid && validateDate(); + isValid = validateDate() && isValid; $(".debit-record").each(function () { - isValid = isValid && validateRecord(this); + isValid = validateRecord(this) && isValid; }); $(".credit-account").each(function () { - isValid = isValid && validateRecord(this); + isValid = validateRecord(this) && isValid; }); $(".record-account").each(function () { - isValid = isValid && validateAccount(this); + isValid = validateAccount(this) && isValid; }); $(".record-summary").each(function () { - isValid = isValid && validateSummary(this); + isValid = validateSummary(this) && isValid; }); $(".record-amount").each(function () { - isValid = isValid && validateAmount(this); + isValid = validateAmount(this) && isValid; }); if (isTransfer()) { - isValid = isValid && validateBalance(); + isValid = validateBalance() && isValid; } - isValid = isValid && validateNote(); + isValid = validateNote() && isValid; return isValid; }