[Rt-commit] r10426 - in rt/branches/3.6-RELEASE: .

[jesse at bestpractical.com]

Author: jesse
Date: Tue Jan 22 12:30:47 2008
New Revision: 10426

Modified:
   rt/branches/3.6-RELEASE/   (props changed)
   rt/branches/3.6-RELEASE/html/Admin/Global/UserRights.html

Log:
 r75534 at pinglin:  jesse | 2008-01-22 12:29:23 -0500
 RT-Ticket: 2661
 RT-Status: resolved
 RT-Update: correspond
 
 Sort order of users in the global rights editor was incorrect. Patch from Emmanuel Lacour


Modified: rt/branches/3.6-RELEASE/html/Admin/Global/UserRights.html
==============================================================================
--- rt/branches/3.6-RELEASE/html/Admin/Global/UserRights.html	(original)
+++ rt/branches/3.6-RELEASE/html/Admin/Global/UserRights.html	Tue Jan 22 12:30:47 2008
@@ -57,10 +57,9 @@
       
 <table>
         
-%	while (my $Member = $Users->Next()) {
-% my $UserObj = $Member->MemberObj->Object();
+%	while (my $UserObj = $Users->Next()) {
 % my $group = RT::Group->new($session{'CurrentUser'});
-% $group->LoadACLEquivalenceGroup($Member->MemberObj);
+% $group->LoadACLEquivalenceGroup($UserObj);
   <tr align="right"> 
 	<td valign="top">
 	    <% $UserObj->Name %>
@@ -89,7 +88,8 @@
 # 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 $Users = $Privileged->UserMembersObj();
+$Users->OrderBy( FIELD => $UserOrderBy, ORDER => $UserOrder );
 
     
   
@@ -98,4 +98,6 @@
 </%INIT>
 
 <%ARGS>
+$UserOrderBy => 'Name'
+$UserOrder => 'ASC'
 </%ARGS>