summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-03-26 17:20:42 +0100
committerDave Lawrence <dlawrence@mozilla.com>2013-03-26 17:20:42 +0100
commita42b92556cc76c45fdc95b0caf903ad9b58fa2a8 (patch)
tree3289f9814e5b98c330787caf7a5e2dd6b6b9747c /template/en
parentb09e5ff2dd0b97a0254e922183abd79025c2e69a (diff)
downloadbugzilla-a42b92556cc76c45fdc95b0caf903ad9b58fa2a8.tar.gz
bugzilla-a42b92556cc76c45fdc95b0caf903ad9b58fa2a8.tar.xz
Bug 852795 - Request emails should include X-Bugzilla-Product, etc headers (fully backport upstream bug 573919)
r=glob
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/email/bugmail-header.txt.tmpl14
-rw-r--r--template/en/default/email/header-common.txt.tmpl24
-rw-r--r--template/en/default/request/email.txt.tmpl1
3 files changed, 26 insertions, 13 deletions
diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index 1cbc8864b..7e871c4f8 100644
--- a/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -33,19 +33,7 @@ Date: [% date %]
X-Bugzilla-Reason: [% reasonsheader %]
X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %]
X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
-[% IF Param('useclassification') %]
-X-Bugzilla-Classification: [% bug.classification %]
-[% END %]
-X-Bugzilla-Product: [% bug.product %]
-X-Bugzilla-Component: [% bug.component %]
-X-Bugzilla-Keywords: [% bug.keywords %]
-X-Bugzilla-Severity: [% bug.bug_severity %]
-X-Bugzilla-Who: [% changer.login %]
-X-Bugzilla-Status: [% bug.bug_status %]
-X-Bugzilla-Resolution: [% bug.resolution %]
-X-Bugzilla-Priority: [% bug.priority %]
-X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
-X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %]
X-Bugzilla-Changed-Field-Names: [% changedfieldnames.join(" ") %]
[%+ threadingmarker %]
diff --git a/template/en/default/email/header-common.txt.tmpl b/template/en/default/email/header-common.txt.tmpl
new file mode 100644
index 000000000..3f3b7d373
--- /dev/null
+++ b/template/en/default/email/header-common.txt.tmpl
@@ -0,0 +1,24 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+ # This Source Code Form is "Incompatible With Secondary Licenses", as
+ # defined by the Mozilla Public License, v. 2.0.
+ #%]
+[% IF Param('useclassification') %]
+X-Bugzilla-Classification: [% bug.classification %]
+[% END %]
+X-Bugzilla-ID: [% bug.id %]
+X-Bugzilla-Product: [% bug.product %]
+X-Bugzilla-Component: [% bug.component %]
+X-Bugzilla-Version: [% bug.version %]
+X-Bugzilla-Keywords: [% bug.keywords %]
+X-Bugzilla-Severity: [% bug.bug_severity %]
+X-Bugzilla-Who: [% changer.login %]
+X-Bugzilla-Status: [% bug.bug_status %]
+X-Bugzilla-Resolution: [% bug.resolution %]
+X-Bugzilla-Priority: [% bug.priority %]
+X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
+X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
+X-Bugzilla-Flags:[% FOREACH flag = bug.flags %] [%+ flag.name %][% flag.status %][% END %]
+X-Bugzilla-OS: [% bug.op_sys %]
diff --git a/template/en/default/request/email.txt.tmpl b/template/en/default/request/email.txt.tmpl
index 510741eed..f05059c1a 100644
--- a/template/en/default/request/email.txt.tmpl
+++ b/template/en/default/request/email.txt.tmpl
@@ -57,6 +57,7 @@ X-Bugzilla-Type: request
[%- IF flag.requestee %]
X-Bugzilla-Flag-Requestee: [% flag.requestee.email %]
[% END %]
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
[%+ threadingmarker %]
[%+ USE wrap -%]