diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2012-03-03 16:00:27 +0100 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2012-03-03 16:00:27 +0100 |
| commit | c4d48bbcc731852975f27365d1af7e27e6db5d57 (patch) | |
| tree | ea6918403fbc8a47d98c195d0d6e1773d6bd8e50 /template/en/default/email | |
| parent | 8b96a54f4a0aa35a6bcc815c4dbaedac7824fbc0 (diff) | |
| download | bugzilla-c4d48bbcc731852975f27365d1af7e27e6db5d57.tar.gz bugzilla-c4d48bbcc731852975f27365d1af7e27e6db5d57.tar.xz | |
Bug 731586: Email notifications about status changes in blockers are incorrectly formatted
r=dkl a=LpSolit
Diffstat (limited to 'template/en/default/email')
| -rw-r--r-- | template/en/default/email/bugmail.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/email/bugmail.txt.tmpl | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl index ac4727811..fa3a447d7 100644 --- a/template/en/default/email/bugmail.html.tmpl +++ b/template/en/default/email/bugmail.html.tmpl @@ -59,10 +59,10 @@ [% BLOCK generate_diffs %] [% SET in_table = 0 %] - [% last_changer = "" %] + [% last_changer = 0 %] [% FOREACH change = diffs %] - [% IF !isnew && change.who.login != last_changer %] - [% last_changer = change.who.login %] + [% IF !isnew && changer.id != last_changer %] + [% last_changer = changer.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 2d20aff7c..0b349fb15 100644 --- a/template/en/default/email/bugmail.txt.tmpl +++ b/template/en/default/email/bugmail.txt.tmpl @@ -50,21 +50,17 @@ You are receiving this mail because: [% BLOCK generate_diffs %] [% urlbase %]show_bug.cgi?id=[% bug.id %] -[%+ last_changer = "" %] +[%+ last_changer = 0 %] [% FOREACH change = diffs %] - [% IF !isnew && change.who.login != last_changer %] - [% last_changer = change.who.login %] + [% IF !isnew && changer.id != last_changer %] + [% last_changer = changer.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 %] - [%~ IF change.who.name %] - [% change.who.name _ " <" _ change.who.login _ ">" %] - [% ELSE %] - [% change.who.login %] - [% END %] changed: + [%~ changer.identity %] changed: [% END %] What |Removed |Added |