Bug 179638: Security group inclusion isn't indicated on "New:" bugmail notifications...

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 150e077d0cee4f793fbd1351a6946def2bdb2938..9f7b2e7536a3726c087a6ae59d4073b920c2fdcc 100644 (file)
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -216,6 +216,15 @@ sub Send {
 
     $values{'blocked'} = join(",", @$blockedlist);
 
+    my $grouplist = $dbh->selectcol_arrayref(
+        '    SELECT name FROM groups
+         INNER JOIN bug_group_map
+                 ON groups.id = bug_group_map.group_id
+                    AND bug_group_map.bug_id = ?',
+        undef, ($id));
+
+    $values{'bug_group'} = join(', ', @$grouplist);
+ 
     my @args = ($id);
 
     # If lastdiffed is NULL, then we don't limit the search on time.

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 3a593e2380ec7605f08b8db0be37126e510c9249..6d271fe11d16a60a06dc773d736235fbfd6fb8b5 100644 (file)
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -195,7 +195,7 @@ use constant DEFAULT_FIELDS => (
     {name => 'everconfirmed',         desc => 'Ever Confirmed'},
     {name => 'reporter_accessible',   desc => 'Reporter Accessible'},
     {name => 'cclist_accessible',     desc => 'CC Accessible'},
-    {name => 'bug_group',             desc => 'Group'},
+    {name => 'bug_group',             desc => 'Group', in_new_bugmail => 1},
     {name => 'estimated_time', desc => 'Estimated Hours', in_new_bugmail => 1},
     {name => 'remaining_time',        desc => 'Remaining Hours'},
     {name => 'deadline',              desc => 'Deadline', in_new_bugmail => 1},