Просмотр исходного кода

Show admin email in enrollment page accessed via dashboard notification and email invitation.

GitOrigin-RevId: 4589a276a1b7db2ba0a5da2c06bde797ba8d0b65
M Fahru 3 лет назад
Родитель
Сommit
c71bf25363

+ 9 - 0
services/web/app/src/Features/Subscription/TeamInvitesController.js

@@ -100,11 +100,20 @@ async function viewInvite(req, res, next) {
           subscription,
           subscription,
         })
         })
 
 
+      let currentManagedUserAdminEmail
+      try {
+        currentManagedUserAdminEmail =
+          await SubscriptionLocator.promises.getAdminEmail(subscription._id)
+      } catch (err) {
+        logger.error({ err }, 'error getting subscription admin email')
+      }
+
       return res.render('subscriptions/team/invite-managed', {
       return res.render('subscriptions/team/invite-managed', {
         inviterName: invite.inviterName,
         inviterName: invite.inviterName,
         inviteToken: invite.token,
         inviteToken: invite.token,
         expired: req.query.expired,
         expired: req.query.expired,
         validationStatus: Object.fromEntries(validationStatus),
         validationStatus: Object.fromEntries(validationStatus),
+        currentManagedUserAdminEmail,
       })
       })
     } else {
     } else {
       let currentManagedUserAdminEmail
       let currentManagedUserAdminEmail

+ 1 - 0
services/web/app/views/subscriptions/team/invite-managed.pug

@@ -9,6 +9,7 @@ block append meta
 	meta(name="ol-expired" data-type="boolean" content=expired)
 	meta(name="ol-expired" data-type="boolean" content=expired)
 	meta(name="ol-alreadyEnrolled" data-type="boolean" content=alreadyEnrolled)
 	meta(name="ol-alreadyEnrolled" data-type="boolean" content=alreadyEnrolled)
 	meta(name="ol-validationStatus" data-type="json" content=validationStatus)
 	meta(name="ol-validationStatus" data-type="json" content=validationStatus)
+	meta(name="ol-currentManagedUserAdminEmail" data-type="string" content=currentManagedUserAdminEmail)
 
 
 block content
 block content
 	main.content.content-alt.team-invite#invite-managed-root
 	main.content.content-alt.team-invite#invite-managed-root

+ 1 - 1
services/web/locales/en.json

@@ -694,7 +694,7 @@
   "group_admins_get_access_to": "Group admins get access to",
   "group_admins_get_access_to": "Group admins get access to",
   "group_admins_get_access_to_info": "Special features available only on group plans.",
   "group_admins_get_access_to_info": "Special features available only on group plans.",
   "group_full": "This group is already full",
   "group_full": "This group is already full",
-  "group_managed_by_group_administrator": "This group is managed by the group administrator",
+  "group_managed_by_group_administrator": "This group is managed by the group administrator (__admin__)",
   "group_members_and_collaborators_get_access_to": "Group members and their project collaborators get access to",
   "group_members_and_collaborators_get_access_to": "Group members and their project collaborators get access to",
   "group_members_and_collaborators_get_access_to_info": "These features are available to group members and their collaborators (other Overleaf users invited to projects owned a group member).",
   "group_members_and_collaborators_get_access_to_info": "These features are available to group members and their collaborators (other Overleaf users invited to projects owned a group member).",
   "group_members_get_access_to": "Group members get access to",
   "group_members_get_access_to": "Group members get access to",