From 952829714b22a5020afabb02b6bab6ce0c8572fa Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Wed, 8 Jul 2015 15:34:04 +0800 Subject: Bug 1143132: emails about redirected attachment urls link to attachment-edit instead of the actual url (mozreview, github, etc) --- template/en/default/request/email.txt.tmpl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'template') 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 %] -- cgit v1.2.3-24-g4f1b