X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FGlobal%2FGroupRights.html;h=13ad0ebadf03ad9281c4abb67fd97c429b4056f2;hb=919e930aa9279b3c5cd12b593889cd6de79d67bf;hp=19ead1ca4817edb7db4203893cedadcc22542b7f;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941;p=freeside.git

diff --git a/rt/share/html/Admin/Global/GroupRights.html b/rt/share/html/Admin/Global/GroupRights.html
index 19ead1ca4..13ad0ebad 100755
--- a/rt/share/html/Admin/Global/GroupRights.html
+++ b/rt/share/html/Admin/Global/GroupRights.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,78 +46,18 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => loc('Modify global group rights') &>
-<& /Admin/Elements/SystemTabs, 
-    current_tab => 'Admin/Global/GroupRights.html', 
-    Title => loc('Modify global group rights') &>  
+<& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-  <form method="post" action="GroupRights.html">
-      
-<&| /Widgets/TitleBox, title => loc('Modify global group rights.')&>
-      
-<h1><&|/l&>System groups</&></h1>
-<table>
-% $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  =>$RT::System &>
-	  </td>
-	</tr>
-% }
-</table>
-<h1><&|/l&>Roles</&></h1>
-<table>
-% $Groups = RT::Groups->new($session{'CurrentUser'});
-% $Groups->LimitToRolesForSystem();
-%	while (my $Group = $Groups->Next()) {
-  <tr align="right"> 
-	<td valign="top">
-	    <% loc($Group->Type) %>
-		  </td>
-	  <td>
-	    <& /Admin/Elements/SelectRights, PrincipalId => $Group->PrincipalId,
-        Object  => $RT::System &>
-	  </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  => $RT::System &>
-	  </td>
-	</tr>
-% }
-</table>
-            
-      </&>
-      <& /Elements/Submit, Label => loc('Modify Group Rights'), Reset => 1 &>
-      
-  </form>
+<form method="post" action="GroupRights.html" id="ModifyGroupRights" name="ModifyGroupRights">
+  <& /Admin/Elements/EditRights, Context => $RT::System, Principals => \@principals &>
+  <& /Elements/Submit, Label => loc('Save Changes') &>
+</form>
   
 <%INIT>
- 
-  #Update the acls.
-  my @results =  ProcessACLChanges(\%ARGS);
+# Update the acls.
+my @results = ProcessACLs(\%ARGS);
 
-
-my $Groups;
-    
+# Principal collections
+my @principals = GetPrincipalsMap($RT::System, qw(System Roles Groups));
 </%INIT>
-
-<%ARGS>
-</%ARGS>