Bug 365735: Add classification, alias, assigned to name, reporter login and reporter...

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index c9f09c551a4e8ddfca8f39eb9eaa57b9c7125e6e..539a481edb732a64363df6bd249860824cb3091c 100644 (file)
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -37,6 +37,7 @@ use Bugzilla::User;
 use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Bug;
+use Bugzilla::Classification;
 use Bugzilla::Product;
 use Bugzilla::Component;
 use Bugzilla::Mailer;
@@ -117,6 +118,7 @@ sub Send {
 
     my $product = new Bugzilla::Product($values{product_id});
     $values{product} = $product->name;
+    $values{classification} = Bugzilla::Classification->new($product->classification_id)->name;
     my $component = new Bugzilla::Component($values{component_id});
     $values{component} = $component->name;
 
@@ -636,6 +638,8 @@ sub sendMail {
         neworchanged => $isnew ? 'New: ' : '',
         to => $user->email,
         bugid => $id,
+        alias => Bugzilla->params->{'usebugaliases'} ? $values{'alias'} : "",
+        classification => $values{'classification'},
         product => $values{'product'},
         comp => $values{'component'},
         keywords => $values{'keywords'},
@@ -643,6 +647,7 @@ sub sendMail {
         status => $values{'bug_status'},
         priority => $values{'priority'},
         assignedto => $values{'assigned_to'},
+        assignedtoname => Bugzilla::User->new({name => $values{'assigned_to'}})->name,
         targetmilestone => $values{'target_milestone'},
         changedfields => $values{'changed_fields'},
         summary => $values{'short_desc'},
@@ -652,6 +657,8 @@ sub sendMail {
         reasonswatchheader => join(" ", @watchingrel),
         changer => $values{'changer'},
         changername => $values{'changername'},
+        reporter => $values{'reporter'},
+        reportername => Bugzilla::User->new({name => $values{'reporter'}})->name,
         diffs => $diffs,
         threadingmarker => $threadingmarker
     };

diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl
index fa7317613c955fa6cc920b38c57c05184df7bbc7..93d002d2a57b55a57317b244fbe1f10750dc2936 100644 (file)
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@@ -25,6 +25,9 @@ Subject: [[% terms.Bug %] [%+ bugid %]] [% neworchanged %][%+ summary %]
 X-Bugzilla-Reason: [% reasonsheader %]
 X-Bugzilla-Type: newchanged
 X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
+[% IF Param('useclassification') %]
+X-Bugzilla-Classification: [% classification %]
+[% END %]
 X-Bugzilla-Product: [% product %]
 X-Bugzilla-Component: [% comp %]
 X-Bugzilla-Keywords: [% keywords %]