3 files changed, 46 insertions, 1 deletions
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
@@ -188,6 +188,25 @@
     </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>
         <input type="submit" value="        
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 %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 93c50b85a..c92824ad3 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -344,6 +344,17 @@
     [% title = "Flag Type Name Invalid" %]
     The name <em>[% name FILTER html %]</em> must be 1-50 characters long.
 
+  [% ELSIF error == "flag_update_denied" %]
+    [% title = "Flag Modification Denied" %]
+    You tried to [% IF status == "+" %] grant [% ELSIF status == "-" %] deny
+    [% ELSIF status == "X" %] clear [% ELSE %] request [% END %]
+    <code>[% name FILTER html %]</code>
+    [% IF status == "?" && old_status != "X" %], but this flag is already
+    set[% END %].
+    Only a sufficiently empowered user [% IF status == "X" %] or the user who
+    set <code>[% name FILTER html %][% old_status FILTER html %]</code> in
+    the first place [% END %] can make this change.
+
   [% ELSIF error == "format_not_found" %]
     [% title = "Format Not Found" %]
     The requested format <em>[% format FILTER html %]</em> does not exist with
@@ -362,6 +373,11 @@
     [% title = "Group not specified" %]
     No group was specified.
 
+  [% ELSIF error == "group_unknown" %]
+    [% title = "Unknown Group" %]
+    The group [% name FILTER html %] does not exist. Please specify
+    a valid group name. Create it first if necessary!
+
   [% ELSIF error == "illegal_at_least_x_votes" %]
     [% title = "Your Search Makes No Sense" %]
     The <em>At least ___ votes</em> field must be a simple number.