diff options
| author | lpsolit%gmail.com <> | 2005-12-14 05:12:23 +0000 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2005-12-14 05:12:23 +0000 |
| commit | 6cbc51f437e951177e7ef35f4779cdf1b23a88b7 (patch) | |
| tree | deec063f7fe354def44672cc79e0b177ad3dfa8b /template/en/default/request | |
| parent | e66be03f10864b3f4ecc4614d9b38333ca1487be (diff) | |
| download | bugs-6cbc51f437e951177e7ef35f4779cdf1b23a88b7.tar bugs-6cbc51f437e951177e7ef35f4779cdf1b23a88b7.tar.gz bugs-6cbc51f437e951177e7ef35f4779cdf1b23a88b7.tar.bz2 bugs-6cbc51f437e951177e7ef35f4779cdf1b23a88b7.tar.xz bugs-6cbc51f437e951177e7ef35f4779cdf1b23a88b7.zip | |
Bug 266147: Internal error when Flag::notify() ends up with an invalid or empty CC: list and no requestee in restricted bugs - Patch by Frédéric Buclin <LpSolit@gmail.com> r=myk a=justdave
Diffstat (limited to 'template/en/default/request')
| -rw-r--r-- | template/en/default/request/email.txt.tmpl | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index d59cad0ec..9c3be3387 100644 --- a/template/en/default/request/email.txt.tmpl +++ b/template/en/default/request/email.txt.tmpl @@ -18,6 +18,7 @@ # # Contributor(s): Myk Melez <myk@mozilla.org> # Jeff Hedlund <jeff.hedlund@matrixsi.com> + # Frédéric Buclin <LpSolit@gmail.com> #%] [% PROCESS global/variables.none.tmpl %] @@ -28,18 +29,16 @@ [% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "cancelled" , '?' => "asked" } %] [% IF flag.status == '?' %] - [% to_email = flag.requestee.email - IF flag.requestee.wants_mail([constants.EVT_FLAG_REQUESTED]) %] - [% to_identity = flag.requestee.identity %] - [% subject_status = "requested" %] + [% to_identity = flag.addressee.identity _ " for" %] + [% subject_status = "requested" %] [% ELSE %] - [% to_email = flag.setter.email - IF flag.setter.wants_mail([constants.EVT_REQUESTED_FLAG]) %] - [% to_identity = flag.setter.identity _ "'s request" %] - [% subject_status = statuses.${flag.status} %] + [% IF flag.addressee %] + [% to_identity = flag.addressee.identity _ "'s request for" %] + [% END %] + [% subject_status = statuses.${flag.status} %] [% END %] From: bugzilla-request-daemon -To: [% to_email %] +To: [% flag.addressee.email %] CC: [% flag.type.cc_list %] Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.target.bug.id %]] [% flag.target.bug.summary %] [%- IF flag.target.attachment.exists %] : @@ -48,7 +47,7 @@ Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.t [%+ USE wrap -%] [%- FILTER bullet = wrap(80) -%] -[% user.identity %] has [% statuses.${flag.status} %] [%+ to_identity %] for [% flag.type.name %]: +[% user.identity %] has [% statuses.${flag.status} %] [%+ to_identity %] [%+ flag.type.name %]: [% terms.Bug %] [%+ bugidsummary %] [% END %] |