From 3af2a748f631ca349daee12f7c3c26a8fb831219 Mon Sep 17 00:00:00 2001 From: Simon Green Date: Fri, 3 Jan 2014 08:24:16 +1000 Subject: Bug 946565 - Bug Mail does not correct notify when two people have made changes r=LpSolit, a=simon --- template/en/default/email/bugmail.html.tmpl | 4 ++-- template/en/default/email/bugmail.txt.tmpl | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'template') 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 %] [% 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 -- cgit v1.2.3-24-g4f1b