Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@226392 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com
2007-05-14 19:27:16 +00:00
parent ac5df8a54f
commit aa0d4e3a1a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/Bugzilla/Flag.pm
View File

@@ -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

8
mozilla/webtools/bugzilla/template/en/default/request/email.txt.tmpl
View File

@@ -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 %]