From 8db750f66141f825e826e537555bd2f50c44131f Mon Sep 17 00:00:00 2001 From: Eduardo Morales Date: Mon, 4 Mar 2024 09:34:44 -0600 Subject: [PATCH] fix: login page now correctly shows email LDAP settings Signed-off-by: Eduardo Morales --- core/src/components/login/LoginForm.vue | 15 +++++++++++++++ core/src/views/Login.vue | 2 ++ 2 files changed, 17 insertions(+) diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue index 9a8689dc9cc..523fb8b6586 100644 --- a/core/src/components/login/LoginForm.vue +++ b/core/src/components/login/LoginForm.vue @@ -156,6 +156,12 @@ export default { type: Boolean, default: false, }, + emailStates: { + type: Array, + default() { + return [] + } + }, }, data() { @@ -207,6 +213,15 @@ export default { loginActionUrl() { return generateUrl('login') }, + emailEnabled() { + return this.emailStates ? this.emailStates.every((state) => state === '1') : 1 + }, + loginText() { + if (this.emailEnabled) { + return t('core', 'Login with username or email') + } + return t('core', 'Login with username') + }, }, mounted() { diff --git a/core/src/views/Login.vue b/core/src/views/Login.vue index 643cf66c07b..4c5d256109f 100644 --- a/core/src/views/Login.vue +++ b/core/src/views/Login.vue @@ -32,6 +32,7 @@ :errors="errors" :throttle-delay="throttleDelay" :auto-complete-allowed="autoCompleteAllowed" + :email-states="emailStates" @submit="loading = true" />