[MM-39072] - Run make build-templates on latest master (#18541)
* [MM-39072] - Run make build-templates on latest master * fix guest template failure
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
4fbcc85c3e
Коммит
2a40a7d649
@@ -515,11 +515,6 @@ func (es *Service) SendGuestInviteEmails(team *model.Team, channels []*model.Cha
|
||||
data.Props["Title"] = i18n.T("api.templates.invite_body.title", map[string]interface{}{"SenderName": senderName, "TeamDisplayName": team.DisplayName})
|
||||
data.Props["SubTitle"] = i18n.T("api.templates.invite_body_guest.subTitle")
|
||||
data.Props["Button"] = i18n.T("api.templates.invite_body.button")
|
||||
data.Props["SenderName"] = senderName
|
||||
data.Props["Message"] = ""
|
||||
if message != "" {
|
||||
data.Props["Message"] = message
|
||||
}
|
||||
data.Props["InviteFooterTitle"] = i18n.T("api.templates.invite_body_footer.title")
|
||||
data.Props["InviteFooterInfo"] = i18n.T("api.templates.invite_body_footer.info")
|
||||
data.Props["InviteFooterLearnMore"] = i18n.T("api.templates.invite_body_footer.learn_more")
|
||||
@@ -555,16 +550,25 @@ func (es *Service) SendGuestInviteEmails(team *model.Team, channels []*model.Cha
|
||||
mlog.Info("sending invitation ", mlog.String("to", invite), mlog.String("link", data.Props["ButtonURL"].(string)))
|
||||
}
|
||||
|
||||
senderPhoto := ""
|
||||
embeddedFiles := make(map[string]io.Reader)
|
||||
if message != "" {
|
||||
if senderProfileImage != nil {
|
||||
data.Props["SenderPhoto"] = "user-avatar.png"
|
||||
senderPhoto = "user-avatar.png"
|
||||
embeddedFiles = map[string]io.Reader{
|
||||
"user-avatar.png": bytes.NewReader(senderProfileImage),
|
||||
senderPhoto: bytes.NewReader(senderProfileImage),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pData := postData{
|
||||
SenderName: senderName,
|
||||
Message: template.HTML(message),
|
||||
SenderPhoto: senderPhoto,
|
||||
}
|
||||
|
||||
data.Props["Posts"] = []postData{pData}
|
||||
|
||||
body, err := es.templatesContainer.RenderToString("invite_body", data)
|
||||
if err != nil {
|
||||
mlog.Error("Failed to send invite email successfully", mlog.Err(err))
|
||||
|
||||
Ссылка в новой задаче
Block a user