diff --git a/backend/resources/app/email/invite-to-team/en.html b/backend/resources/app/email/invite-to-team/en.html
index 337593902d..31d1ddf4a3 100644
--- a/backend/resources/app/email/invite-to-team/en.html
+++ b/backend/resources/app/email/invite-to-team/en.html
@@ -186,7 +186,8 @@
- {{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”.
+ {{invited-by|abbreviate:25}} has invited you to join the team “{{ team|abbreviate:25 }}”{% if organization %}
+ part of the organization “{{ organization|abbreviate:25 }}”{% endif %}.
|
diff --git a/backend/src/app/rpc/commands/teams_invitations.clj b/backend/src/app/rpc/commands/teams_invitations.clj
index deed84912c..d4a2f96ded 100644
--- a/backend/src/app/rpc/commands/teams_invitations.clj
+++ b/backend/src/app/rpc/commands/teams_invitations.clj
@@ -21,6 +21,7 @@
[app.email :as eml]
[app.loggers.audit :as audit]
[app.main :as-alias main]
+ [app.nitrate :as nitrate]
[app.rpc :as-alias rpc]
[app.rpc.commands.profile :as profile]
[app.rpc.commands.teams :as teams]
@@ -154,14 +155,18 @@
(audit/submit! cfg event))
(when (allow-invitation-emails? member)
- (eml/send! {::eml/conn conn
- ::eml/factory eml/invite-to-team
- :public-uri (cf/get :public-uri)
- :to email
- :invited-by (:fullname profile)
- :team (:name team)
- :token itoken
- :extra-data ptoken}))
+ (let [team (if (contains? cf/flags :nitrate)
+ (nitrate/add-org-info-to-team cfg team {})
+ team)]
+ (eml/send! {::eml/conn conn
+ ::eml/factory eml/invite-to-team
+ :public-uri (cf/get :public-uri)
+ :to email
+ :invited-by (:fullname profile)
+ :team (:name team)
+ :organization (:organization-name team)
+ :token itoken
+ :extra-data ptoken})))
itoken)))))