From e2b870ee7d00a2ac369e59393e49dbd8ccd18f42 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 17 Feb 2010 21:48:46 +0000
Subject: [PATCH] Bug 545029: When deleting a group, no warning is thrown about
 group inheritance r=mkanat a=LpSolit

git-svn-id: svn://10.0.0.236/branches/BUGZILLA-3_6-BRANCH@259730 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                        | 2 +-
 .../template/en/default/admin/groups/delete.html.tmpl    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index da9f0d05a6f..4f3e88a8f07 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-6975
\ No newline at end of file
+6976
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/groups/delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/groups/delete.html.tmpl
index c1a9403f987..9d32da4de69 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/groups/delete.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/groups/delete.html.tmpl
@@ -60,6 +60,15 @@
     all users from this group for me.</label></p>
   [% END %]
 
+  [% IF group.granted_by_direct(constants.GROUP_MEMBERSHIP).size %]
+    <p><b>Members of this group inherit membership in the following groups:</b></p>
+    <ul>
+      [% FOREACH grantor = group.granted_by_direct(constants.GROUP_MEMBERSHIP) %]
+        <li>[% grantor.name FILTER html %]</li>
+      [% END %]
+    </ul>
+  [% END %]
+
   [% IF group.bugs.size %]
     <p><b>[% group.bugs.size FILTER html %] [%+ terms.bug %] reports are
      visible only to this group. You cannot delete this group while any