[Rt-commit] r10461 - in rt/branches/3.6-EXPERIMENTAL-ABERDEEN: . html/Admin/Global

[audreyt at bestpractical.com]

Author: audreyt
Date: Thu Jan 24 00:02:25 2008
New Revision: 10461

Modified:
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/   (props changed)
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/CustomFields/GroupRights.html
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/Global/UserRights.html
   rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf

Log:
 r18721 at T (orig r10424):  jesse | 2008-01-23 00:45:37 +0800
  r75532 at pinglin:  jesse | 2008-01-22 11:43:46 -0500
  3.6.6 final
 
 r18723 at T (orig r10426):  jesse | 2008-01-23 01:30:47 +0800
  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
 
 r18732 at T (orig r10435):  jesse | 2008-01-23 05:01:09 +0800
  r75548 at pinglin:  jesse | 2008-01-22 16:00:36 -0500
  * patch to clean up ACL updates from Steve Turner
 


Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/CustomFields/GroupRights.html
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/CustomFields/GroupRights.html	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/CustomFields/GroupRights.html	Thu Jan 24 00:02:25 2008
@@ -109,60 +109,7 @@
 $CustomFieldObj->Load($id) || $m->comp("/Elements/Error", Why => loc("Couldn't load CustomField [_1]",$id));
 
 my $Groups;
-  
-  my ( $ACL, @results );
-
-    foreach my $arg (keys %ARGS) {
-        if ($arg =~ /GrantRight-(\d+)-(.*?)-(\d+)$/) {
-            my $principal_id = $1;
-            my $object_type = $2;
-            my $object_id = $3;
-            my $rights = $ARGS{$arg};
-
-            my $principal = RT::Principal->new($session{'CurrentUser'});
-            $principal->Load($principal_id);
-            my $obj;
-
-            if ($object_type eq 'RT::CustomField') {
-                $obj = RT::CustomField->new($session{'CurrentUser'});
-                $obj->Load($object_id);
-            } else {
-                push (@results, loc("System Error").
-                                loc("Rights could not be granted for [_1]", $object_type));
-                next;
-            }
-
-            my @rights = ref($ARGS{$arg}) eq 'ARRAY' ? @{$ARGS{$arg}} : ($ARGS{$arg});
-            foreach my $right (@rights) {
-                next unless ($right);
-                my ($val, $msg) = $principal->GrantRight(Object => $obj, Right => $right);
-                push (@results, $msg);
-            }
-        }
-     elsif ($arg =~ /RevokeRight-(\d+)-(.*?)-(\d+)-(.*?)$/) {
-            my $principal_id = $1;
-            my $object_type = $2;
-            my $object_id = $3;
-            my $right = $4;
-
-            my $principal = RT::Principal->new($session{'CurrentUser'});
-            $principal->Load($principal_id);
-            next unless ($right);
-            my $obj;
-
-            if ($object_type eq 'RT::CustomField') {
-                $obj = RT::CustomField->new($session{'CurrentUser'});
-                $obj->Load($object_id);
-            } else {
-                push (@results, loc("System Error").
-                                loc("Rights could not be revoked for [_1]", $object_type));
-                next;
-            }
-            my ($val, $msg) = $principal->RevokeRight(Object => $obj, Right => $right);
-            push (@results, $msg);
-        }
-} 
-
+my @results = ProcessACLChanges(\%ARGS);   
 my $title = loc('Modify group rights for custom field [_1]', $CustomFieldObj->Name);
     
 </%INIT>

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/Global/UserRights.html
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/Global/UserRights.html	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/html/Admin/Global/UserRights.html	Thu Jan 24 00:02:25 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>

Modified: rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf
==============================================================================
--- rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf	(original)
+++ rt/branches/3.6-EXPERIMENTAL-ABERDEEN/releng.cnf	Thu Jan 24 00:02:25 2008
@@ -1,5 +1,5 @@
 PRODUCT			        = rt
-TAG			            = 3.6.6rc3
+TAG			            = 3.6.6
 CANONICAL_REPO		    = svn+ssh://svn.bestpractical.com/svn/bps-public/rt/
 TAGS		            = tags/
 TRUNK	                = branches/3.6-RELEASE