Эх сурвалжийг харах

Merge pull request #4070 from overleaf/jel-email-button-tooltip

Fix check for disabled "Make Primary" button when email needs reconfirmation

GitOrigin-RevId: efbe56e77402cbbc673a41ce24390fb77ede2481
Hugh O'Brien 5 жил өмнө
parent
commit
13db97cbfa

+ 1 - 1
services/web/app/views/user/settings/user-affiliations.pug

@@ -110,7 +110,7 @@ form.row(
 								+btnMakePrimaryDisabled(translate("please_link_before_making_primary"))
 								+btnMakePrimaryDisabled(translate("please_link_before_making_primary"))
 							.affiliations-table-inline-action-disabled-wrapper(ng-if="!userEmail.ssoAvailable")
 							.affiliations-table-inline-action-disabled-wrapper(ng-if="!userEmail.ssoAvailable")
 								+btnMakePrimaryDisabled(translate("please_confirm_your_email_before_making_it_default"))
 								+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"))
 							+btnMakePrimaryDisabled(translate("please_reconfirm_your_affiliation_before_making_this_primary"))
 						button.btn.btn-sm.btn-success.affiliations-table-inline-action(
 						button.btn.btn-sm.btn-success.affiliations-table-inline-action(
 							tooltip=translate("make_email_primary_description")
 							tooltip=translate("make_email_primary_description")