diff options
| author | Byron Jones <glob@mozilla.com> | 2015-07-08 09:34:04 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-07-08 09:34:04 +0200 |
| commit | 952829714b22a5020afabb02b6bab6ce0c8572fa (patch) | |
| tree | 51d37c74a4b8d221e48a2f17478674767ea63671 /template/en/default/request | |
| parent | b46c86a9013a85e6244cb78cdb4bba3c6f7cd5a9 (diff) | |
| download | bugzilla-952829714b22a5020afabb02b6bab6ce0c8572fa.tar.gz bugzilla-952829714b22a5020afabb02b6bab6ce0c8572fa.tar.xz | |
Bug 1143132: emails about redirected attachment urls link to attachment-edit instead of the actual url (mozreview, github, etc)
Diffstat (limited to 'template/en/default/request')
| -rw-r--r-- | template/en/default/request/email.txt.tmpl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index 01d72260f..2b9ea3782 100644 --- a/template/en/default/request/email.txt.tmpl +++ b/template/en/default/request/email.txt.tmpl @@ -25,14 +25,17 @@ [% bugidsummary = bug.bug_id _ ': ' _ bug.short_desc %] [% attidsummary = attachment.id _ ': ' _ attachment.description %] [% flagtype_name = flag ? flag.type.name : old_flag.type.name %] -[%# Upstreaming: denied (bug 621883) %] -[% statuses = { '+' => "granted" , '-' => 'not granted' , 'X' => "canceled" , - '?' => "asked" } %] +[% statuses = { '+' => "granted" , '-' => 'not granted' , 'X' => "canceled" , '?' => "asked" } %] [% to_identity = "" %] [% on_behalf_of = 0 %] [% action = flag.status || 'X' %] +[% + attach_url = { title => "", href => "" }; + Hook.process("start"); +%] + [% IF flag && flag.status == '?' %] [% subject_status = "requested" %] [% IF flag.setter_id == user.id %] @@ -78,6 +81,9 @@ X-Bugzilla-Flag-Requestee: [% flag.requestee.email %] [% FILTER bullet = wrap(80) %] Attachment [% attidsummary %] [%- END %] +[% IF attach_url.href %] +[%+ attach_url.title _ ": " _ attach_url.href %] +[%- END %] [%+ urlbase %]attachment.cgi?id=[% attachment.id %]&action=edit [%- END %] |