X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FQueues%2FGroupRights.html;h=4c5ca071bcb5468496c6f1e62ee6e9782778d79e;hb=43a06151e47d2c59b833cbd8c26d97865ee850b6;hp=ed3d5e27e60a4bad246012142867c44e0f3a6bf5;hpb=6587f6ba7d047ddc1686c080090afe7d53365bd4;p=freeside.git

diff --git a/rt/share/html/Admin/Queues/GroupRights.html b/rt/share/html/Admin/Queues/GroupRights.html
index ed3d5e27e..4c5ca071b 100755
--- a/rt/share/html/Admin/Queues/GroupRights.html
+++ b/rt/share/html/Admin/Queues/GroupRights.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,75 +46,22 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => loc('Modify group rights for queue [_1]', $QueueObj->Name) &>
-<& /Admin/Elements/QueueTabs, id => $id, 
-    QueueObj => $QueueObj,                                                      
-    current_tab => $current_tab, 
-    Title => loc('Modify group rights for queue [_1]', $QueueObj->Name) &>
+<& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-  <form method="post" action="GroupRights.html">
-    <input type="hidden" class="hidden" name="id" value="<% $QueueObj->id %>" />
-      
-      
-<h1><&|/l&>System groups</&></h1>
-<table>
-% $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
-% $Groups = RT::Groups->new($session{'CurrentUser'});
-% $Groups->LimitToSystemInternalGroups();
-%	while (my $Group = $Groups->Next()) {
-  <tr align="right"> 
-	<td valign="top">
-	    <% loc($Group->Type) %>
-		  </td>
-	  <td>
-	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
-        Object => $QueueObj  &>
-	  </td>
-	</tr>
-% }
-</table>
-<h1><&|/l&>Roles</&></h1>
-<table>
-% $Groups = RT::Groups->new($session{'CurrentUser'});
-% $Groups->LimitToRolesForQueue($QueueObj->Id);
-%	while (my $Group = $Groups->Next()) {
-  <tr align="right"> 
-	<td valign="top">
-	    <% loc($Group->Type) %>
-		  </td>
-	  <td>
-	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
-        Object => $QueueObj  &>
-	  </td>
-	</tr>
-% }
-</table>
-<h1><&|/l&>User defined groups</&></h1>
-<table>
-% $Groups = RT::Groups->new($session{'CurrentUser'});
-% $Groups->LimitToUserDefinedGroups();    
-%	while (my $Group = $Groups->Next()) {
-  <tr align="right"> 
-	<td valign="top">
-	    <% $Group->Name %>
-		  </td>
-	  <td>
-	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
-        Object => $QueueObj  &>
-	  </td>
-	</tr>
-% }
-</table>
-            
-      <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
-      
-  </form>
-  
-<%INIT>
- 
-  #Update the acls.
-  my @results =  ProcessACLChanges(\%ARGS);
+<form method="post" action="GroupRights.html" id="ModifyGroupRights" name="ModifyGroupRights">
+  <input type="hidden" class="hidden" name="id" value="<% $QueueObj->id %>" />
+
+% $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results, principals => \@principals );
+
+  <& /Admin/Elements/EditRights, Context => $QueueObj, Principals => \@principals &>
 
+  <& /Elements/Submit, Label => loc('Save Changes') &>
+</form>
+
+<%INIT>
+# Update the acls.
+my @results = ProcessACLs(\%ARGS);
 
 if (!defined $id) {
     Abort(loc("No Queue defined"));
@@ -123,12 +70,9 @@ if (!defined $id) {
 my $QueueObj = RT::Queue->new($session{'CurrentUser'});
 $QueueObj->Load($id) || Abort(loc("Couldn't load queue [_1]",$id));
 
-my $Groups;
-my $current_tab;
-$current_tab = 'Admin/Queues/GroupRights.html?id='.$QueueObj->id;
-    
+# Principal collections
+my @principals = GetPrincipalsMap($QueueObj, qw(System Roles Groups));
 </%INIT>
-
 <%ARGS>
 $id => undef
 </%ARGS>