From 69e0c23f417942ee09cac40d924b64fd9d41cfbf Mon Sep 17 00:00:00 2001 From: Selase Krakani <849886+s3lase@users.noreply.github.com> Date: Tue, 11 Jul 2023 12:17:40 +0000 Subject: [PATCH] FIX: Conditionally hide `Add Alternate Email` button based on site setting (#22525) Hide button in UI if `max_allowed_secondary_emails` site setting is 0. --- .../discourse/app/controllers/preferences/account.js | 8 ++++++++ .../discourse/app/templates/preferences/account.hbs | 2 +- .../discourse/tests/acceptance/preferences-test.js | 12 ++++++++++++ config/site_settings.yml | 1 + 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/account.js b/app/assets/javascripts/discourse/app/controllers/preferences/account.js index 2d90b4dd007..8131d5dea74 100644 --- a/app/assets/javascripts/discourse/app/controllers/preferences/account.js +++ b/app/assets/javascripts/discourse/app/controllers/preferences/account.js @@ -140,6 +140,14 @@ export default Controller.extend(CanCheckEmails, { return findAll().length > 0; }, + @discourseComputed( + "siteSettings.max_allowed_secondary_emails", + "model.can_edit_email" + ) + canAddEmail(maxAllowedSecondaryEmails, canEditEmail) { + return maxAllowedSecondaryEmails > 0 && canEditEmail; + }, + @action resendConfirmationEmail(email, event) { event?.preventDefault(); diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs index df67088fda1..06cfd1559b2 100644 --- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs +++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs @@ -67,7 +67,7 @@ {{/each}} - {{#if this.model.can_edit_email}} + {{#if this.canAddEmail}}