From 0309b1599d3444db3a3d29c3c3f3dfcab7fc4c89 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 30 Nov 2012 10:20:48 -0500
Subject: Bug 417756 - An option to get Product/Component in email subject/body
 r=glob

---
 extensions/BMO/template/en/default/email/bugmail.html.tmpl | 7 ++++++-
 extensions/BMO/template/en/default/email/bugmail.txt.tmpl  | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'extensions/BMO/template/en/default')

diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
index 9fbefa02b..6385fe09a 100644
--- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl
+++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
@@ -30,7 +30,7 @@
     .new .c1 {
       border-right: 1px solid #969696;
     }
-    #noreply, #reason, #tracking {
+    #noreply, #reason, #tracking, #bug_details {
       font-size: 90%;
       color: #666666;
     }
@@ -90,6 +90,11 @@
     <br>
   [% END %]
 
+  <div id="bug_details">
+    <hr>
+    Product | Component: [% bug.product FILTER html %] | [% bug.component FILTER html %]
+  </div>
+
 [% USE Bugzilla %]
 [% tracking_flags = [] %]
 [% FOREACH field = Bugzilla.active_custom_fields(product => bug.product_obj, component => bug.component_obj, type => 2) %]
diff --git a/extensions/BMO/template/en/default/email/bugmail.txt.tmpl b/extensions/BMO/template/en/default/email/bugmail.txt.tmpl
index c82827c61..5fee39374 100644
--- a/extensions/BMO/template/en/default/email/bugmail.txt.tmpl
+++ b/extensions/BMO/template/en/default/email/bugmail.txt.tmpl
@@ -36,6 +36,9 @@ Referenced [% terms.Bugs %]:
 -- [%# Protect the trailing space of the signature marker %]
 Configure [% terms.bug %]mail: [% urlbase %]userprefs.cgi?tab=email
 
+-------------------------------
+Product | Component: [%+ bug.product +%] | [%+ bug.component %]
+
 [% USE Bugzilla %]
 [% tracking_flags = [] %]
 [% FOREACH field = Bugzilla.active_custom_fields(product => bug.product_obj, component => bug.component_obj, type => 2) %]
-- 
cgit v1.2.3-24-g4f1b