From 7dfa01ebed37c5312b30fd97a56f680de642a9dc Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Thu, 1 Jan 2009 23:24:38 +0000
Subject: Bug 179638: Security group inclusion isn't indicated on "New:"
 bugmail notifications - Patch by Teemu Mannermaa <wicked@sci.fi> r/a=mkanat

---
 Bugzilla/BugMail.pm | 9 +++++++++
 Bugzilla/Field.pm   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 150e077d0..9f7b2e753 100644
--- 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 3a593e238..6d271fe11 100644
--- 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},
-- 
cgit v1.2.3-24-g4f1b