From feff47d2dc181836e9ab55e2237da775e769efc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=83=E7=9F=B3?= Date: Tue, 30 Jul 2024 14:04:03 +0800 Subject: [PATCH] feat: skip agreement check when the terms are not visible (#3088) --- web/src/auth/LoginPage.js | 4 +++- web/src/auth/SignupPage.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js index 1e90b59c..2ff88dbd 100644 --- a/web/src/auth/LoginPage.js +++ b/web/src/auth/LoginPage.js @@ -749,7 +749,9 @@ class LoginPage extends React.Component { application.providers.filter(providerItem => this.isProviderVisible(providerItem)).map((providerItem, id) => { return ( { - if (!this.form.current.getFieldValue("agreement")) { + const agreementChecked = this.form.current.getFieldValue("agreement"); + + if (agreementChecked !== undefined && typeof agreementChecked === "boolean" && !agreementChecked) { e.preventDefault(); message.error(i18next.t("signup:Please accept the agreement!")); } diff --git a/web/src/auth/SignupPage.js b/web/src/auth/SignupPage.js index a3c1c62a..8d6b3d8c 100644 --- a/web/src/auth/SignupPage.js +++ b/web/src/auth/SignupPage.js @@ -656,7 +656,9 @@ class SignupPage extends React.Component { application.providers.filter(providerItem => this.isProviderVisible(providerItem)).map((providerItem, id) => { return ( { - if (!this.form.current.getFieldValue("agreement")) { + const agreementChecked = this.form.current.getFieldValue("agreement"); + + if (agreementChecked !== undefined && typeof agreementChecked === "boolean" && !agreementChecked) { e.preventDefault(); message.error(i18next.t("signup:Please accept the agreement!")); }