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

Bug 946565 - Bug Mail does not correct notify when two people have made changes

Browse Source 
r=LpSolit, a=simon


git-svn-id: svn://10.0.0.236/trunk@265160 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org
2014-01-02 22:30:42 +00:00
parent 14ded6f71d
commit d5347b9033
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@@ -1 +1 @@
8844
8845

19
mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
View File

@@ -89,15 +89,17 @@ sub Send {
if ($params->{dep_only}) {
push(@diffs, { field_name => 'bug_status',
old => $params->{changes}->{bug_status}->[0],
new => $params->{changes}->{bug_status}->[1],
old => $params->{changes}->{bug_status}->[0],
new => $params->{changes}->{bug_status}->[1],
login_name => $changer->login,
blocker => $params->{blocker} },
who => $changer,
blocker => $params->{blocker} },
{ field_name => 'resolution',
old => $params->{changes}->{resolution}->[0],
new => $params->{changes}->{resolution}->[1],
old => $params->{changes}->{resolution}->[0],
new => $params->{changes}->{resolution}->[1],
login_name => $changer->login,
blocker => $params->{blocker} });
who => $changer,
blocker => $params->{blocker} });
}
else {
push(@diffs, _get_diffs($bug, $end, \%user_cache));
@@ -566,7 +568,10 @@ sub _get_new_bugmail_fields {
# If there isn't anything to show, don't include this header.
next unless $value;
push(@diffs, {field_name => $name, new => $value});
push(@diffs, {
field_name => $name,
who => $bug->reporter,
new => $value});
}
return @diffs;

4
mozilla/webtools/bugzilla/template/en/default/email/bugmail.html.tmpl
View File

@@ -68,8 +68,8 @@
[% SET in_table = 0 %]
[% last_changer = 0 %]
[% FOREACH change = diffs %]
[% IF !isnew && changer.id != last_changer %]
[% last_changer = changer.id %]
[% IF !isnew && change.who.id != last_changer %]
[% last_changer = change.who.id %]
[% IF in_table == 1 %]
</table>
[% SET in_table = 0 %]

11
mozilla/webtools/bugzilla/template/en/default/email/bugmail.txt.tmpl
View File

@@ -45,18 +45,21 @@ You are receiving this mail because:
[% BLOCK generate_diffs %]
[% urlbase %]show_bug.cgi?id=[% bug.id %]
[%+ last_changer = 0 %]
[% IF isnew %]
[%+ +%]
[% END %]
[% FOREACH change = diffs %]
[% IF !isnew && changer.id != last_changer %]
[% last_changer = changer.id %]
[% IF !isnew && change.who.id != last_changer %]
[% last_changer = change.who.id %]
[% IF change.blocker %]
[% terms.Bug %] [%+ bug.id %] depends on [% terms.bug %] [%+ change.blocker.id %], which changed state.
[%+ terms.Bug %] [%+ change.blocker.id %] Summary: [% change.blocker.short_desc %]
[%+ urlbase %]show_bug.cgi?id=[% change.blocker.id %]
[% ELSE %]
[%~ changer.identity %] changed:
[% change.who.identity %] changed:
[% END %]
What |Removed |Added