From 13db97cbfae5d00b40ff9edb0c55fe50e0271592 Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Tue, 25 May 2021 14:24:35 +0100 Subject: [PATCH] Merge pull request #4070 from overleaf/jel-email-button-tooltip Fix check for disabled "Make Primary" button when email needs reconfirmation GitOrigin-RevId: efbe56e77402cbbc673a41ce24390fb77ede2481 --- services/web/app/views/user/settings/user-affiliations.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 5be7eaf7b0..ebeb6ade14 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -110,7 +110,7 @@ form.row( +btnMakePrimaryDisabled(translate("please_link_before_making_primary")) .affiliations-table-inline-action-disabled-wrapper(ng-if="!userEmail.ssoAvailable") +btnMakePrimaryDisabled(translate("please_confirm_your_email_before_making_it_default")) - .affiliations-table-inline-action-disabled-wrapper(ng-if="inReconfirmNotificationPeriod(userEmail)") + .affiliations-table-inline-action-disabled-wrapper(ng-if="!userEmail.default && inReconfirmNotificationPeriod(userEmail)") +btnMakePrimaryDisabled(translate("please_reconfirm_your_affiliation_before_making_this_primary")) button.btn.btn-sm.btn-success.affiliations-table-inline-action( tooltip=translate("make_email_primary_description")