Bug 251837: Extend group_group_map to control which groups can see each other

r=kiko
a=justdave

1 files changed, 82 insertions, 30 deletions

diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl
index 619db777c..bdda7e27b 100644
--- a/template/en/default/admin/groups/edit.html.tmpl
+++ b/template/en/default/admin/groups/edit.html.tmpl
@@ -24,23 +24,34 @@
 
 [%# INTERFACE:
   # group_id: number. The group ID.
-  # name: string. The name of the group.
+  # name: string. The name of the group. [grantor]
   # description: string. The description of the group.
   # rexp: string. The regular expression for the users of the group.
   # isactive: boolean int. Shows if the group is still active.
   # isbuggroup: boolean int. Is 1 if this is a bug group.
   # groups: array with group objects having the properties:
   #   - grpid: number. The ID of the group.
-  #   - grpname: string. The name of the group.
+  #   - grpname: string. The name of the group. [member]
   #   - grpdesc: string. The description of the group.
-  #   - grpmember: boolean int. Is 1 if the current user is a group member.
-  #   - blessmember: boolean int. Is 1 if the current user can bless members
-  #                  in the current group.
+  #   - grpmember: boolean int. Is 1 if members of the group are to inherit
+  #                membership in the group being edited.
+  #   - blessmember: boolean int. Is 1 if members of the group are to be able
+  #                  to bless users into the group being edited.
+  #   - membercansee: boolean int. Is 1 if the members of the group are to
+  #                   be aware of the group being edited and its members.
   #%]
 
 
 [% PROCESS global/header.html.tmpl
-  title = "Change Group"
+  title = "Change Group: $name"
+  style = "tr.odd_row {
+               background: #e9e9e9; 
+           }
+           .permissions th {
+               background: #000000;
+               color: #ffffff;
+           }
+          "
 %]
 
 <form method="post" action="editgroups.cgi">
@@ -96,45 +107,86 @@
       <li> by being a member of one of the groups included in this group
            by checking the boxes below.
     </ul>
-  </p>
 
-  <table>
-    <tr>
-      <td colspan="4">Members of these groups can grant membership to this group</td>
-    </tr>
-    <tr>
-      <td align="center">|</td>
-      <td colspan="3">Members of these groups are included in this group</td>
-    </tr>
-    <tr>
-      <td align="center">|</td>
-      <td align="center">|</td>
-      <td colspan="2"></td>
+  [% usevisibility = Param('usevisibilitygroups') %]
+
+    <h4>Group Permissions</h4>
+  <table class="permissions" cellspacing="0" cellpadding="2">
+    <tr>     
+      [% IF usevisibility %]
+        <th>
+          Visible
+        </th>
+      [% END %]
+      <th>
+        Grant
+      </th>
+      <th>
+        Inherit
+      </th>
+      <th>
+        Group
+      </th>
+      <th>
+        Description
+      </th>
     </tr>
+    [% row = 0 %]
     [% FOREACH group = groups %]
-      <tr>
-        <td>
+      [% row = row + 1 %]
+      <tr [% 'class="odd_row"' IF row % 2 %]>
+        [% IF usevisibility %]
+          <td align="center">
+            <input type="checkbox" name="cansee-[% group.grpid FILTER none %]" 
+              [% group.membercansee ? "checked " : "" %]value="1">
+            <input type="hidden" name="oldcansee-[% group.grpid FILTER none %]"
+              value="[% group.membercansee FILTER none %]">
+          </td>
+        [% END %]
+        <td align="center">
           <input type="checkbox" name="bless-[% group.grpid FILTER html %]" [% group.blessmember ? "checked " : "" %]value="1">
           <input type="hidden" name="oldbless-[% group.grpid FILTER html %]" value="[% group.blessmember FILTER html %]">
         </td>
-        <td>
+        <td align="center">
           <input type="checkbox" name="grp-[% group.grpid FILTER html %]" [% group.grpmember ? "checked " : "" %]value="1">
           <input type="hidden" name="oldgrp-[% group.grpid FILTER html %]" value="[% group.grpmember FILTER html %]">
         </td>
-        <td><b>[% group.grpnam FILTER html %]</b></td>
-        <td>[% group.grpdesc FILTER html %]</td>
+        <td align="left" class="groupname">
+          <a href="[% "editgroups.cgi?action=changeform&group=${group.grpid}" FILTER html %]">
+            [% group.grpnam FILTER html %]
+          </a>
+        </td>
+        <td align="left" class="groupdesc">[% group.grpdesc FILTER html %]</td>
       </tr>
     [% END %]
   </table>
   
-  <input type="submit" value="Submit">
-
-  <p>
-  <table width="76%" border="1">
+  <input type="submit" value="Save Changes">
+  <br>
+  <dl>
+    [% IF usevisibility %]
+      <dt>Visibility:</dt>
+      <dd>
+        Members of the selected groups can be aware of the 
+        "[% name FILTER html %]" group
+      </dd>
+    [% END %]
+    <dt>Grant:</dt>
+    <dd>
+    Members of the selected groups can grant membership to the
+    "[% name FILTER html %]" group
+    </dd>
+    <dt>Inherit:</dt>
+    <dd>
+      Members of the selected groups are automatically members of the
+      "[% name FILTER html %]" group
+    </dd>
+  </dl>
+  <table width="76%" border="0">
     <tr>
       <td>
-        <p><strong>Conversion of groups created with [% terms.Bugzilla %]
-        versions 2.16 and prior:</strong></p>
+        <h4>Conversion of groups created with [% terms.Bugzilla %]
+        versions 2.16 and prior:</h4>
         
         <ul>
           <li>Remove all explicit memberships from this group: