[Rt-commit] rt branch, rightsmatrix, updated. rt-3.8.8-675-g92caed0

[Thomas Sibley]

The branch, rightsmatrix has been updated
       via  92caed09ad97d68dd590db23055c4d6652e6884e (commit)
      from  f4bb682254078968216d63ee1766f3b2fb65781e (commit)

Summary of changes:
 share/html/Admin/Elements/EditRights         |   18 +++++++++++++++++-
 share/html/NoAuth/css/base/rights-editor.css |    7 +++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 92caed09ad97d68dd590db23055c4d6652e6884e
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Sep 3 12:02:27 2010 -0400

    Show implicit subgroups also getting rights for user defined groups

diff --git a/share/html/Admin/Elements/EditRights b/share/html/Admin/Elements/EditRights
index 85feff3..e108af3 100644
--- a/share/html/Admin/Elements/EditRights
+++ b/share/html/Admin/Elements/EditRights
@@ -118,7 +118,23 @@ for my $category (@$Principals) {
 </%perl>
 
   <div id="<% $id %>">
-    <h3><% $loc ? loc($display) : $display %></h3>
+    <h3>
+      <% $loc ? loc($display) : $display %>
+<%perl>
+if ($obj->isa('RT::Group') and $obj->Domain eq 'UserDefined') {
+    my $subgroups = $obj->GroupMembersObj( Recursively => 1 );
+    $subgroups->LimitToUserDefinedGroups;
+    $subgroups->Limit( FIELD => 'Name', OPERATOR => '!=', VALUE => $obj->Name );
+
+    if ( $subgroups->Count ) {
+        my $inc = join ", ", map $_->Name, @{$subgroups->ItemsArrayRef};
+</%perl>
+      <span class="subgroups"><&|/l, $inc &>includes [_1]</&></span>\
+<%perl>
+    }
+}
+</%perl>
+    </h3>
     <div class="category-tabs">
       <ul>
 % for my $category (sort { $catsort{$a} <=> $catsort{$b} } keys %categories) {
diff --git a/share/html/NoAuth/css/base/rights-editor.css b/share/html/NoAuth/css/base/rights-editor.css
index 5b5c216..937123c 100644
--- a/share/html/NoAuth/css/base/rights-editor.css
+++ b/share/html/NoAuth/css/base/rights-editor.css
@@ -54,7 +54,14 @@ li.category ~ li.category {
 }
 
 .rights-editor .ui-tabs-panel h3 {
+    color: black;
     margin-top: 0;
+    line-height: 0.8em;
+}
+
+.rights-editor .ui-tabs-panel h3 .subgroups {
+    color: #444;
+    font-size: 80%;
 }
 
 .rights-editor ul.rights-list {

-----------------------------------------------------------------------