diff options
author | lpsolit%gmail.com <> | 2007-08-08 20:07:35 +0200 |
---|---|---|
committer | lpsolit%gmail.com <> | 2007-08-08 20:07:35 +0200 |
commit | 8d9074a59f0bfa4b79256e5524a447397e3490de (patch) | |
tree | 3ba3a4277bd23f977bf22f7eb9ad8daff5c9fee8 /template | |
parent | a33a5f6ed8bf4f8c20ccad3d4cc379059cdc2fbd (diff) | |
download | bugzilla-8d9074a59f0bfa4b79256e5524a447397e3490de.tar.gz bugzilla-8d9074a59f0bfa4b79256e5524a447397e3490de.tar.xz |
Bug 376061: Changing the requestee of a flag should not change the requester if the one doing the change is the requestee himself - Patch by Frédéric Buclin <LpSolit@gmail.com> r=myk a=LpSolit
Diffstat (limited to 'template')
-rw-r--r-- | template/en/default/request/email.txt.tmpl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index 22c1ffbd6..125439937 100644 --- a/template/en/default/request/email.txt.tmpl +++ b/template/en/default/request/email.txt.tmpl @@ -29,9 +29,15 @@ '?' => "asked" } %] [% to_identity = "" %] +[% on_behalf_of = 0 %] [% IF flag.status == '?' %] - [% to_identity = flag.requestee.identity _ " for" %] [% subject_status = "requested" %] + [% IF flag.setter.id == user.id %] + [% to_identity = flag.requestee.identity _ " for" %] + [% ELSE %] + [% on_behalf_of = 1 %] + [% IF flag.requestee %][% to_identity = " to " _ flag.requestee.identity %][% END %] + [% END %] [% ELSE %] [% IF flag.requester %] [% to_identity = flag.requester.identity _ "'s request for" %] @@ -48,7 +54,12 @@ X-Bugzilla-Type: request [%+ USE wrap -%] [%- FILTER bullet = wrap(80) -%] +[% IF on_behalf_of %] +[% user.identity %] has reassigned [% flag.setter.identity %]'s request for [% flag.type.name %] +[% to_identity %]: +[% ELSE %] [% user.identity %] has [% statuses.${flag.status} %] [%+ to_identity %] [%+ flag.type.name %]: +[% END %] [% terms.Bug %] [%+ bugidsummary %] [% END %] |