From eb2423b1c5e3090d09db856e7020f4dd24232674 Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net" <>
Date: Wed, 24 Nov 2004 06:41:43 +0000
Subject: Patch for bug 180879: Implement privs for bug flags modification;
 patch by Frédéric Buclin <LpSolit@netscape.net>, r=joel, a=justdave.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/en/default/admin/flag-type/edit.html.tmpl | 19 +++++++++++++++++++
 template/en/default/admin/groups/delete.html.tmpl  | 12 +++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

(limited to 'template/en/default/admin')

diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index 1faaaf3b8..253a310ac 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -187,6 +187,25 @@
       </td>
     </tr>
 
+    <tr>
+      <th>Grant Group:</th>
+      <td>
+        the group allowed to grant/deny flags of this type
+        (to allow all users to grant/deny these flags, leave this empty)<br>
+        <input type="text" name="grant_gid" value="[% type.grant_gid FILTER html %]" size="50" maxlength="255">
+      </td>
+    </tr>
+
+    <tr>
+      <th>Request Group:</th>
+      <td>
+        if flags of this type are requestable, the group allowed to request them
+        (to allow all users to request these flags, leave this empty)<br>
+        Note that the request group alone has no effect if the grant group is not defined!<br>
+        <input type="text" name="request_gid" value="[% type.request_gid FILTER html %]" size="50" maxlength="255">
+      </td>
+    </tr>
+
     <tr>
       <th></th>
       <td>
diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl
index 905f68cf3..842e2c6f1 100644
--- a/template/en/default/admin/groups/delete.html.tmpl
+++ b/template/en/default/admin/groups/delete.html.tmpl
@@ -29,6 +29,7 @@
   # hasusers: boolean int. True if the group includes users in it.
   # hasbugs: boolean int. True if the group includes bugs in it.
   # hasproduct: boolean int. True if the group is binded to a product.
+  # hasflags: boolean int. True if the group is used by a flag type.
   # buglist: string. The list of bugs included in this group.
   #%]
 
@@ -81,11 +82,20 @@
     <br><input type="checkbox" name="unbind">Delete this group anyway,
     and make the <U>[% name FILTER html %]</U> publicly visible.</p>
   [% END %]
+  
+  [% IF hasflags %]
+    <p><b>This group restricts who can make changes to flags of certain types.
+    You cannot delete this group while there are flag types using it.</b>
+
+    <br><a href="editflagtypes.cgi?action=list&group=[% gid FILTER html %]">Show
+    me which types</a> - <input type="checkbox" name="removeflags">Remove all
+    flag types from this group for me.</p>
+  [% END %]
 
   <h2>Confirmation</h2>
 
   <p>Do you really want to delete this group?</p>
-  [% IF (hasusers || hasbugs || hasproduct) %]
+  [% IF (hasusers || hasbugs || hasproduct || hasflags) %]
     <p><b>You must check all of the above boxes or correct the
           indicated problems first before you can proceed.</b></p>
   [% END %]
-- 
cgit v1.2.3-24-g4f1b