diff options
author | Simon Green <sgreen@redhat.com> | 2014-01-02 23:24:16 +0100 |
---|---|---|
committer | Simon Green <sgreen@redhat.com> | 2014-01-02 23:24:16 +0100 |
commit | 3af2a748f631ca349daee12f7c3c26a8fb831219 (patch) | |
tree | 7f0f5f1a9bd95941be656e79fc529c5b5f90ae13 | |
parent | 8c1cdef6abdd4dabc768760f182067402da09145 (diff) | |
download | bugzilla-3af2a748f631ca349daee12f7c3c26a8fb831219.tar.gz bugzilla-3af2a748f631ca349daee12f7c3c26a8fb831219.tar.xz |
Bug 946565 - Bug Mail does not correct notify when two people have made changes
r=LpSolit, a=simon
-rw-r--r-- | Bugzilla/BugMail.pm | 19 | ||||
-rw-r--r-- | template/en/default/email/bugmail.html.tmpl | 4 | ||||
-rw-r--r-- | template/en/default/email/bugmail.txt.tmpl | 11 |
3 files changed, 21 insertions, 13 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index bdbc21e5a..6c7be5e12 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -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; diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl index a5fc25ee3..1a604b3b1 100644 --- a/template/en/default/email/bugmail.html.tmpl +++ b/template/en/default/email/bugmail.html.tmpl @@ -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 %] diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl index b8d11e0e1..95cda7f10 100644 --- a/template/en/default/email/bugmail.txt.tmpl +++ b/template/en/default/email/bugmail.txt.tmpl @@ -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 |