瀏覽代碼

Merge pull request #3605 from overleaf/jel-disabled-delete-primary

Add disabled delete button for the primary email

GitOrigin-RevId: 8cb3285bdfce0909796ae60c13d8e8ebb1236d00
Jessica Lawshe 5 年之前
父節點
當前提交
2bef6cd2e5
共有 2 個文件被更改,包括 24 次插入 和 11 次删除
  1. 21 9
      services/web/app/views/user/settings/user-affiliations.pug
  2. 3 2
      services/web/locales/en.json

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

@@ -14,6 +14,26 @@ mixin btnMakePrimaryDisabled(tooltip)
 			type="button"
 			type="button"
 		) #{translate("make_primary")}
 		) #{translate("make_primary")}
 
 
+mixin btnRemoveEmail()
+	.affiliations-table-inline-action-disabled-wrapper(ng-if="userEmail.default")
+		div(
+			tooltip=translate("please_change_primary_to_remove")
+			tooltip-enable="!ui.isMakingRequest"
+			tooltip-placement="left"
+		)
+			button.btn.btn-sm.btn-danger(disabled)
+				i.fa.fa-fw.fa-trash(aria-hidden="true")
+				span.sr-only #{translate("please_change_primary_to_remove")}
+	button.btn.btn-sm.btn-danger.affiliations-table-inline-action(
+		ng-if="!userEmail.default"
+		ng-click="removeUserEmail(userEmail)"
+		ng-disabled="ui.isMakingRequest"
+		tooltip=translate("remove")
+		type="button"
+	)
+		i.fa.fa-fw.fa-trash(aria-hidden="true")
+		span.sr-only #{translate("remove")}
+
 form.row(
 form.row(
 	ng-controller="UserAffiliationsController"
 	ng-controller="UserAffiliationsController"
 	name="affiliationsForm"
 	name="affiliationsForm"
@@ -97,15 +117,7 @@ form.row(
 							type="button"
 							type="button"
 						) #{translate("make_primary")}
 						) #{translate("make_primary")}
 						|  
 						|  
-						button.btn.btn-sm.btn-danger.affiliations-table-inline-action(
-							ng-if="!userEmail.default"
-							ng-click="removeUserEmail(userEmail)"
-							ng-disabled="ui.isMakingRequest"
-							tooltip=translate("remove")
-							type="button"
-						)
-							i.fa.fa-fw.fa-trash(aria-hidden="true")
-							span.sr-only #{translate("remove")}
+						+btnRemoveEmail()
 				tr.affiliations-table-saml-row(ng-repeat-end ng-if="userEmail.affiliation && userEmail.affiliation && userEmail.ssoAvailable")
 				tr.affiliations-table-saml-row(ng-repeat-end ng-if="userEmail.affiliation && userEmail.affiliation && userEmail.ssoAvailable")
 					td
 					td
 					td(ng-attr-colspan="{{userEmail.samlProviderId ? '2' : '1'}}" ng-class="institutionAlreadyLinked(userEmail) ? '' : 'with-border'")
 					td(ng-attr-colspan="{{userEmail.samlProviderId ? '2' : '1'}}" ng-class="institutionAlreadyLinked(userEmail) ? '' : 'with-border'")

+ 3 - 2
services/web/locales/en.json

@@ -1341,5 +1341,6 @@
   "looks_like_youre_at": "It looks like you're at <0>__institutionName__</0>!",
   "looks_like_youre_at": "It looks like you're at <0>__institutionName__</0>!",
   "add_affiliation": "Add Affiliation",
   "add_affiliation": "Add Affiliation",
   "did_you_know_institution_providing_professional": "Did you know that __institutionName__ is providing <0>free __appName__ Professional features</0> to everyone at __institutionName__?",
   "did_you_know_institution_providing_professional": "Did you know that __institutionName__ is providing <0>free __appName__ Professional features</0> to everyone at __institutionName__?",
-  "add_email_to_claim_features": "Add an institutional email address to claim your features."
-}
+  "add_email_to_claim_features": "Add an institutional email address to claim your features.",
+  "please_change_primary_to_remove": "Please change your primary email in order to remove"
+}