Ticket #3921: sort-and-perm-display-enhancement.2.patch

webadmin/perm.py

@@ -60 +60 @@
                         perm.revoke_permission(subject, action)
                 req.redirect(self.env.href.admin(cat, page))
         
-        perms.sort(lambda a, b: cmp(a[0], b[0]))
+        #sort by subject+perm, so we get the perms sorted inside the subject
+        perms.sort(lambda a, b: cmp(a[0]+a[1], b[0]+b[1]))
         req.hdf['admin.actions'] = perm.get_actions()
         req.hdf['admin.perms'] = [{'subject': p[0],
                                    'action': p[1],

webadmin/templates/admin_perm.cs

@@ -36 +36 @@
 <form method="post">
  <table class="listing" id="permlist">
   <thead>
-   <tr><th class="sel">&nbsp;</th><th>Subject</th><th>Action</th></tr>
-  </thead><tbody><?cs
-  each:perm = admin.perms ?>
-   <tr>
-    <td><input type="checkbox" name="sel" value="<?cs var:perm.key ?>" /></td>
-    <td><?cs var:perm.subject ?></td>
-    <td><?cs var:perm.action ?></td>
-   </tr><?cs
-  /each ?></tbody>
+   <tr><th width="100">Subject</th><th>Action</th></tr>
+  </thead>
+  <tbody>
+   <?cs set:firstRun="1" ?>
+   <?cs each:perm = admin.perms ?>         
+    <?cs # draws the start of a row for each new person ?>
+     <?cs if:(perm.subject != lastSubject) ?>
+      <?cs if:(firstRun=="0")?></td></tr><?cs /if ?>
+       <tr>
+        <td><?cs var:perm.subject ?></td>
+        <td>
+      <?cs /if ?>         
+
+          <div style="width:150px;display:block;float:left;">
+       <input type="checkbox" name="sel" value="<?cs var:perm.key ?>" />
+       <?cs var:perm.action ?>
+      </div>
+        
+      <?cs set:firstRun="0"?>         
+      <?cs set:lastSubject=perm.subject?>
+    <?cs /each ?>
+    <?cs # this is needed to close-up after the last subject  ?>
+    </td></tr>
+  </tbody>
  </table>
  <div class="buttons">
   <input type="submit" name="remove" value="Remove selected items" />