From ddd3586c06d81d8732dd96498b63de029f30349e Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 30 Sep 2021 00:20:18 +0100 Subject: [PATCH] Fix missing repo link in issue/pull assigned emails (#17183) There was a mistake in the template file: `templates/mail/issue/assigned.tmpl` where the repourl was generated from a non-existent release instead of the issue. This PR changes this to use the issue but also ensure that the issue repo is loaded. It also slightly improves the English locale string. Fix #17160 Signed-off-by: Andrew Thornton Co-authored-by: delvh --- options/locale/locale_en-US.ini | 4 ++-- services/mailer/mail.go | 6 ++++++ templates/mail/issue/assigned.tmpl | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 028c25a768a..bd95cc8d892 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -346,8 +346,8 @@ reset_password.text = Please click the following link to recover your account wi register_success = Registration successful -issue_assigned.pull = @%[1]s assigned you to the pull request %[2]s in repository %[3]s. -issue_assigned.issue = @%[1]s assigned you to the issue %[2]s in repository %[3]s. +issue_assigned.pull = @%[1]s assigned you to pull request %[2]s in repository %[3]s. +issue_assigned.issue = @%[1]s assigned you to issue %[2]s in repository %[3]s. issue.x_mentioned_you = @%s mentioned you: issue.action.force_push = %[1]s force-pushed the %[2]s from %[3]s to %[4]s. diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 979f8aa2271..721f6eb49ba 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -372,6 +372,12 @@ func SendIssueAssignedMail(issue *models.Issue, doer *models.User, content strin // No mail service configured return nil } + + if err := issue.LoadRepo(); err != nil { + log.Error("Unable to load repo [%d] for issue #%d [%d]. Error: %v", issue.RepoID, issue.Index, issue.ID, err) + return err + } + langMap := make(map[string][]*models.User) for _, user := range recipients { langMap[user.Language] = append(langMap[user.Language], user) diff --git a/templates/mail/issue/assigned.tmpl b/templates/mail/issue/assigned.tmpl index 61e4a44f024..1c3b9309781 100644 --- a/templates/mail/issue/assigned.tmpl +++ b/templates/mail/issue/assigned.tmpl @@ -8,7 +8,7 @@ {{.Subject}} -{{$repo_url := printf "%s" .Release.Repo.HTMLURL .Release.Repo.FullName}} +{{$repo_url := printf "%s" .Issue.Repo.HTMLURL .Issue.Repo.FullName}} {{$link := printf "#%d" .Link .Issue.Index}}