X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FCustomFields%2FUserRights.html;h=608d5dc406155fca65ae01c1ee33d7f2de24e899;hb=33beebf4cb42eba3e1dd868ad5e0af102de961da;hp=f581588a89c391939911e68ae8f601d9b48d1e38;hpb=7ac86daf67b0a95153b736d5811f9050363f6553;p=freeside.git

diff --git a/rt/share/html/Admin/CustomFields/UserRights.html b/rt/share/html/Admin/CustomFields/UserRights.html
index f581588a8..608d5dc40 100644
--- a/rt/share/html/Admin/CustomFields/UserRights.html
+++ b/rt/share/html/Admin/CustomFields/UserRights.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,43 +46,17 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/CustomFieldTabs, id => $id, 
-current_tab => "Admin/CustomFields/UserRights.html?id=".$id,
-Title => $title, &>
+<& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-  <form method="post" action="UserRights.html">
+  <form method="post" action="UserRights.html" name="ModifyUserRights" id="ModifyUserRights">
     <input type="hidden" class="hidden" name="id" value="<% $CustomFieldObj->id %>" />
-      
-      
-<table>
-        
-%	while (my $Member = $Users->Next()) {
-% my $UserObj = $Member->MemberObj->Object();
-% my $group = RT::Group->new($session{'CurrentUser'});
-% $group->LoadACLEquivalenceGroup($Member->MemberObj);
-  <tr align="right"> 
-	<td valign="top"><& /Elements/ShowUser, User => $UserObj &></td>
-	  <td>
-	    <& /Admin/Elements/SelectRights, PrincipalId=> $group->PrincipalId,
-        Object => $CustomFieldObj  &>
-	  </td>
-	</tr>
-% }
-      </table>
-            
-      <& /Elements/Submit, Caption => loc("Be sure to save your changes"), Reset => 1 &>
-      
+    <& /Admin/Elements/EditRights, Context => $CustomFieldObj, Principals => \@principals &>
+    <& /Elements/Submit, Label => loc('Save Changes') &>
   </form>
-  
 <%INIT>
- 
-#Update the acls.
-my @results = ProcessACLChanges( \%ARGS );
-
-# {{{ Deal with setting up the display of current rights.
-
-
+# Update the acls.
+my @results = ProcessACLs( \%ARGS );
 
 if (!defined $id) {
     $m->comp("/Elements/Error", Why => loc("No Class defined"));
@@ -91,20 +65,12 @@ if (!defined $id) {
 my $CustomFieldObj = RT::CustomField->new($session{'CurrentUser'});
 $CustomFieldObj->Load($id) || $m->comp("/Elements/Error", Why => loc("Couldn't load Class [_1]",$id));
 
-# Find out which users we want to display ACL selects for
-my $Privileged = RT::Group->new($session{'CurrentUser'});
-$Privileged->LoadSystemInternalGroup('Privileged');
-my $Users = $Privileged->MembersObj();
-
 my $title = loc('Modify user rights for custom field [_1]', $CustomFieldObj->Name);
-  
-# }}}
-    
+
+# Principal collections
+my @principals = GetPrincipalsMap($CustomFieldObj, qw(Users));
 </%INIT>
 
 <%ARGS>
 $id => undef
-$UserString => undef
-$UserOp => undef
-$UserField => undef
 </%ARGS>