summaryrefslogtreecommitdiffstats
path: root/template/en/default/email
diff options
context:
space:
mode:
authorDavid Lawrence <dlawrence@mozilla.com>2011-11-02 19:18:56 +0100
committerDavid Lawrence <dlawrence@mozilla.com>2011-11-02 19:18:56 +0100
commita69987ae8fbc227ec1bf4633ad308be81c9f9ff3 (patch)
tree4f3e55afe8ae34298145142a1ce7e28e2b02aa3f /template/en/default/email
parent4a56b6cfca7fceba41f496ebfd7b0e7f3d12c952 (diff)
downloadbugzilla-a69987ae8fbc227ec1bf4633ad308be81c9f9ff3.tar.gz
bugzilla-a69987ae8fbc227ec1bf4633ad308be81c9f9ff3.tar.xz
Bug 697371 - link to comment in emails looks like it is part of the comment
Diffstat (limited to 'template/en/default/email')
-rw-r--r--template/en/default/email/bugmail.txt.tmpl7
1 files changed, 3 insertions, 4 deletions
diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl
index 27e390fc0..b663954f7 100644
--- a/template/en/default/email/bugmail.txt.tmpl
+++ b/template/en/default/email/bugmail.txt.tmpl
@@ -25,8 +25,8 @@
[% isnew = bug.lastdiffed ? 0 : 1 %]
-[% UNLESS to_user.settings.product_chooser.value == 'full_product_chooser' %]
-Do not reply to this email. You can add comments to this [% terms.bug %] at
+[% IF !user.in_group('editbugs') %]
+Do not reply to this email. You can add comments to this [% terms.bug %] at
[% END %]
[%+ PROCESS generate_diffs -%]
@@ -35,7 +35,6 @@ Do not reply to this email. You can add comments to this [% terms.bug %] at
[%- IF comment.count %]
--- Comment #[% comment.count %] from [% comment.author.identity %] ---
-[%+ urlbase %]show_bug.cgi?id=[% bug.id %]#c[% comment.count %]
[% END %]
[%+ comment.body_full({ is_bugmail => 1, wrap => 1 }) %]
[% END %]
@@ -53,7 +52,7 @@ You are receiving this mail because:
[%+ reason_lines.join("\n") %]
[% BLOCK generate_diffs %]
- [% urlbase %]show_bug.cgi?id=[% bug.id %]
+ [% urlbase %]show_bug.cgi?id=[% bug.id %][% "#c" _ new_comments.first.count IF new_comments.size > 0 %]
[%+ last_changer = "" %]
[% FOREACH change = diffs %]