diff options
| author | lpsolit%gmail.com <> | 2007-05-15 02:25:21 +0200 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2007-05-15 02:25:21 +0200 |
| commit | 399108ea7381ed961c33bbfdafec78824fe737da (patch) | |
| tree | 2a919900b1bf6252101cc2efa050e412aa1560e7 | |
| parent | d48ca3b1db102bb50b831ce0f9bbbf7117afedd8 (diff) | |
| download | bugzilla-399108ea7381ed961c33bbfdafec78824fe737da.tar.gz bugzilla-399108ea7381ed961c33bbfdafec78824fe737da.tar.xz | |
Bug 379787: Flag request mail has a blank requestee when requestee doesn't get the mail - Patch by Frédéric Buclin <LpSolit@gmail.com> r=wicked r=myk a=LpSolit
| -rw-r--r-- | Bugzilla/Flag.pm | 2 | ||||
| -rw-r--r-- | template/en/default/request/email.txt.tmpl | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm index c3981d92b..7473ea1f1 100644 --- a/Bugzilla/Flag.pm +++ b/Bugzilla/Flag.pm @@ -746,6 +746,7 @@ sub modify { my $requester; if ($flag->status eq '?') { $requester = $flag->setter; + $flag->{'requester'} = $requester; } # Now update the flag object with its new values. $flag->{'setter'} = $setter; @@ -905,6 +906,7 @@ sub clear { my $requester; if ($flag->status eq '?') { $requester = $flag->setter; + $flag->{'requester'} = $requester; } # Now update the flag object to its new values. The last diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl index 1a20a4115..22c1ffbd6 100644 --- a/template/en/default/request/email.txt.tmpl +++ b/template/en/default/request/email.txt.tmpl @@ -27,12 +27,14 @@ [% attidsummary = attachment.id _ ': ' _ attachment.description %] [% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" , '?' => "asked" } %] + +[% to_identity = "" %] [% IF flag.status == '?' %] - [% to_identity = flag.addressee.identity _ " for" %] + [% to_identity = flag.requestee.identity _ " for" %] [% subject_status = "requested" %] [% ELSE %] - [% IF flag.addressee %] - [% to_identity = flag.addressee.identity _ "'s request for" %] + [% IF flag.requester %] + [% to_identity = flag.requester.identity _ "'s request for" %] [% END %] [% subject_status = statuses.${flag.status} %] [% END %] |