[Rt-commit] r18996 - in rt/3.999/trunk: lib/RT lib/RT/IsPrincipal share/html/Admin/CustomFields share/html/Admin/Elements share/html/Admin/Global share/html/Admin/Groups share/html/Admin/Queues share/html/Admin/Users share/html/Elements t/shredder

ruz at bestpractical.com ruz at bestpractical.com
Tue Mar 31 06:52:15 EDT 2009


Author: ruz
Date: Tue Mar 31 06:51:57 2009
New Revision: 18996

Modified:
   rt/3.999/trunk/lib/RT/IsPrincipal/HasMembers.pm
   rt/3.999/trunk/lib/RT/IsPrincipalCollection.pm
   rt/3.999/trunk/share/html/Admin/CustomFields/GroupRights.html
   rt/3.999/trunk/share/html/Admin/CustomFields/UserRights.html
   rt/3.999/trunk/share/html/Admin/Elements/QueueRightsForUser
   rt/3.999/trunk/share/html/Admin/Elements/SelectRights
   rt/3.999/trunk/share/html/Admin/Global/GroupRights.html
   rt/3.999/trunk/share/html/Admin/Global/UserRights.html
   rt/3.999/trunk/share/html/Admin/Groups/GroupRights.html
   rt/3.999/trunk/share/html/Admin/Groups/UserRights.html
   rt/3.999/trunk/share/html/Admin/Queues/GroupRights.html
   rt/3.999/trunk/share/html/Admin/Queues/People.html
   rt/3.999/trunk/share/html/Admin/Queues/UserRights.html
   rt/3.999/trunk/share/html/Admin/Users/Memberships.html
   rt/3.999/trunk/share/html/Elements/MySupportQueues
   rt/3.999/trunk/t/api/users.t
   rt/3.999/trunk/t/shredder/02queue.t

Log:
* more principal_id -> principal

Modified: rt/3.999/trunk/lib/RT/IsPrincipal/HasMembers.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/IsPrincipal/HasMembers.pm	(original)
+++ rt/3.999/trunk/lib/RT/IsPrincipal/HasMembers.pm	Tue Mar 31 06:51:57 2009
@@ -238,7 +238,7 @@
 # In the dim future, this will all get factored out and life
 # will get better
 
-# takes a paramhash of { principal_id => undef }
+# takes a paramhash of { principal => undef }
 
 sub _add_member {
     my $self = shift;

Modified: rt/3.999/trunk/lib/RT/IsPrincipalCollection.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/IsPrincipalCollection.pm	(original)
+++ rt/3.999/trunk/lib/RT/IsPrincipalCollection.pm	Tue Mar 31 06:51:57 2009
@@ -13,16 +13,12 @@
 sub principals_alias {
     my $self = shift;
 
-    return $self->{'princ_alias'} if $self->{'princ_alias'};
-
-    $self->{'princ_alias'} = $self->new_alias('Principals');
-    $self->join(
+    return $self->{'princ_alias'} ||= $self->join(
         alias1  => 'main',
         column1 => 'id',
-        alias2  => $self->principals_alias,
+        table2  => 'Principals',
         column2 => 'id'
     );
-    return $self->{'princ_alias'};
 }
 
 =head2 limit_to_enabled

Modified: rt/3.999/trunk/share/html/Admin/CustomFields/GroupRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/CustomFields/GroupRights.html	(original)
+++ rt/3.999/trunk/share/html/Admin/CustomFields/GroupRights.html	Tue Mar 31 06:51:57 2009
@@ -67,7 +67,7 @@
 	    <% _($Group->type) %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         object => $CustomFieldObj  &>
 	  </td>
 	</tr>
@@ -83,7 +83,7 @@
 	    <% $Group->name %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         object => $CustomFieldObj  &>
 	  </td>
 	</tr>

Modified: rt/3.999/trunk/share/html/Admin/CustomFields/UserRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/CustomFields/UserRights.html	(original)
+++ rt/3.999/trunk/share/html/Admin/CustomFields/UserRights.html	Tue Mar 31 06:51:57 2009
@@ -64,7 +64,7 @@
   <tr align="right"> 
 	<td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id=> $group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal=> $group->principal_id,
         object => $CustomFieldObj  &>
 	  </td>
 	</tr>

Modified: rt/3.999/trunk/share/html/Admin/Elements/QueueRightsForUser
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Elements/QueueRightsForUser	(original)
+++ rt/3.999/trunk/share/html/Admin/Elements/QueueRightsForUser	Tue Mar 31 06:51:57 2009
@@ -59,6 +59,6 @@
 $ACL->limit_principal_to_user($principal_id);
 </%INIT>
 <%ARGS>
-$principal_id => undef
+$principal => undef
 $queue_obj => undef
 </%ARGS>

Modified: rt/3.999/trunk/share/html/Admin/Elements/SelectRights
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Elements/SelectRights	(original)
+++ rt/3.999/trunk/share/html/Admin/Elements/SelectRights	Tue Mar 31 06:51:57 2009
@@ -89,20 +89,15 @@
     # lead me to start to suspect that we really want users and groups
     # to just be the same table. or _maybe_ that we want an object db.
     my $princ = RT::Model::Principal->new(current_user => RT->system_user);
-    $princ->load($principal_id);
-    if ($princ->type eq 'User') {
-    my $group = RT::Model::Group->new(current_user => RT->system_user);
-        $group->load_acl_equivalence($princ);
-        $principal_id = $group->principal_id;
-    }
-
+    $princ->load($principal);
+    $princ = $princ->acl_equivalence_group;
 
     my $acl_obj = RT::Model::ACECollection->new( current_user => Jifty->web->current_user );
     my $ACE = RT::Model::ACE->new( current_user => Jifty->web->current_user );
 
 
     $acl_obj->limit_to_object( $object);
-    $acl_obj->limit_to_principal( id => $principal_id);
+    $acl_obj->limit_to_principal( id => $princ->id);
     $acl_obj->order_by(column=>'right_name'); 
 
     if (ref($object) && UNIVERSAL::can($object, 'available_rights')) { 
@@ -113,11 +108,11 @@
                 %Rights = ( _('System Error') => _("No rights found") );
         }
         
-    $ACLDesc = "$principal_id-".ref($object)."-".$object->id;
+    $ACLDesc = "$principal-".ref($object)."-".$object->id;
 </%INIT>
     
 <%ARGS>
 $type => undef
-$principal_id => undef
+$principal => undef
 $object =>undef
 </%ARGS>

Modified: rt/3.999/trunk/share/html/Admin/Global/GroupRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Global/GroupRights.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Global/GroupRights.html	Tue Mar 31 06:51:57 2009
@@ -65,7 +65,7 @@
 	    <% _($Group->type) %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         object  =>RT->system &>
 	  </td>
 	</tr>
@@ -81,7 +81,7 @@
 	    <% _($Group->type) %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         object  => RT->system &>
 	  </td>
 	</tr>
@@ -97,7 +97,7 @@
 	    <% $Group->name %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         object  => RT->system &>
 	  </td>
 	</tr>

Modified: rt/3.999/trunk/share/html/Admin/Global/UserRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Global/UserRights.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Global/UserRights.html	Tue Mar 31 06:51:57 2009
@@ -62,7 +62,7 @@
   <tr align="right">
 	<td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
 	<td><& /Admin/Elements/SelectRights,
-        principal_id => $group->principal_id,
+        principal => $group->principal_id,
         object => RT->system,
     &></td>
   </tr>

Modified: rt/3.999/trunk/share/html/Admin/Groups/GroupRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Groups/GroupRights.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Groups/GroupRights.html	Tue Mar 31 06:51:57 2009
@@ -67,7 +67,7 @@
 	    <% _($Group->type) %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         type => 'Group',
         object => $GroupObj  &>
 	  </td>
@@ -84,7 +84,7 @@
 	    <% $Group->name %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         type => 'Group',
         object => $GroupObj  &>
 	  </td>

Modified: rt/3.999/trunk/share/html/Admin/Groups/UserRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Groups/UserRights.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Groups/UserRights.html	Tue Mar 31 06:51:57 2009
@@ -62,7 +62,7 @@
   <tr align="right">
     <td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
     <td><& /Admin/Elements/SelectRights,
-        principal_id => $Member->member_obj->id,
+        principal => $Member->member_obj->id,
         type => 'User',
         object => $GroupObj,
     &></td>

Modified: rt/3.999/trunk/share/html/Admin/Queues/GroupRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Queues/GroupRights.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Queues/GroupRights.html	Tue Mar 31 06:51:57 2009
@@ -67,7 +67,7 @@
 	    <% _($Group->type) %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         object => $queue_obj  &>
 	  </td>
 	</tr>
@@ -83,7 +83,7 @@
 	    <% _($Group->type) %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         object => $queue_obj  &>
 	  </td>
 	</tr>
@@ -99,7 +99,7 @@
 	    <% $Group->name %>
 		  </td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id => $Group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal => $Group->principal_id,
         object => $queue_obj  &>
 	  </td>
 	</tr>

Modified: rt/3.999/trunk/share/html/Admin/Queues/People.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Queues/People.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Queues/People.html	Tue Mar 31 06:51:57 2009
@@ -154,7 +154,7 @@
 
     if (($key =~ /^Queue-$id-DeleteWatcher-Type-(.*?)-Principal-(\d*)$/)) {;
 	    my ($code, $msg) = $queue_obj->delete_watcher(type => $1,
-                                                    principal_id => $2);
+                                                    principal => $2);
 	    push @results, $msg;
     }
 }
@@ -167,7 +167,7 @@
 	 ($key =~ /^Queue-AddWatcher-Principal-(\d*)$/) ) {
 	Jifty->log->debug("Adding a watcher $1 to ".$ARGS{$key}."\n");
 	my ($code, $msg) = $queue_obj->add_watcher(type => $ARGS{$key},
-				                             principal_id => $1);
+				                             principal => $1);
 	push @results, $msg;
     }
 }

Modified: rt/3.999/trunk/share/html/Admin/Queues/UserRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Queues/UserRights.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Queues/UserRights.html	Tue Mar 31 06:51:57 2009
@@ -65,7 +65,7 @@
   <tr align="right"> 
 	<td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
 	  <td>
-	    <& /Admin/Elements/SelectRights, principal_id=> $group->principal_id,
+	    <& /Admin/Elements/SelectRights, principal=> $group->principal_id,
         object => $queue_obj  &>
 	  </td>
 	</tr>

Modified: rt/3.999/trunk/share/html/Admin/Users/Memberships.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Users/Memberships.html	(original)
+++ rt/3.999/trunk/share/html/Admin/Users/Memberships.html	Tue Mar 31 06:51:57 2009
@@ -123,11 +123,11 @@
 
 my $is_member = RT::Model::GroupCollection->new( current_user => Jifty->web->current_user );
 $is_member->limit_to_user_defined_groups;
-$is_member->with_member( principal_id => $user_object->id );
+$is_member->with_member( principal => $user_object->id );
 
 my $is_not_member = RT::Model::GroupCollection->new( current_user => Jifty->web->current_user );
 $is_not_member->limit_to_user_defined_groups;
-$is_not_member->without_member( principal_id => $user_object->id );
+$is_not_member->without_member( principal => $user_object->id );
 
 $format ||= q{'<a href="__WebPath__/Admin/Groups/Modify.html?id=__id__">__id__</a>/TITLE:#'}
     .q{,'<a href="__WebPath__/Admin/Groups/Modify.html?id=__id__">__name__</a>/TITLE:name'}

Modified: rt/3.999/trunk/share/html/Elements/MySupportQueues
==============================================================================
--- rt/3.999/trunk/share/html/Elements/MySupportQueues	(original)
+++ rt/3.999/trunk/share/html/Elements/MySupportQueues	Tue Mar 31 06:51:57 2009
@@ -48,7 +48,7 @@
 <&|/Widgets/TitleBox, title => _("Queues I'm an AdminCc for"), bodyclass => "" &>
 <& /Elements/QueueSummary,
    cache => 'my_support_queues',
-   queue_filter => sub  { $_->is_watcher( role => 'admin_cc', principal_id => Jifty->web->current_user->id) },
+   queue_filter => sub  { $_->is_watcher( role => 'admin_cc', principal => Jifty->web->current_user->id) },
    conditions => \@conditions,
 &>
 </&>

Modified: rt/3.999/trunk/t/api/users.t
==============================================================================
--- rt/3.999/trunk/t/api/users.t	(original)
+++ rt/3.999/trunk/t/api/users.t	Tue Mar 31 06:51:57 2009
@@ -10,7 +10,7 @@
 use_ok('RT::Model::UserCollection');
 
 ok(my $users = RT::Model::UserCollection->new(current_user => RT->system_user));
-$users->who_have_right(object =>RT->system, right =>'SuperUser');
+$users->who_have_right(object => RT->system, right =>'SuperUser');
 is($users->count , 1, "There is one privileged superuser - Found ". $users->count );
 
 
@@ -27,7 +27,7 @@
 *RTx::System::Id = sub  { 1; };
 *RTx::System::id = *RTx::System::Id;
 my $ace = RT::Model::ACE->new(current_user => RT->system_user);
-($id, $msg) = $ace->RT::Record::create( principal_id => $group->id, type => 'Group', right_name => 'RTxUserright', object_type => 'RTx::System', object_id  => 1 );
+($id, $msg) = $ace->RT::Record::create( principal => $group->id, type => 'Group', right_name => 'RTxUserright', object_type => 'RTx::System', object_id  => 1 );
 ok ($id, "ACL for RTxSysObj Created");
 
 my $RTxObj = {};
@@ -48,7 +48,7 @@
 is($users->count, 1, "RTxUserright found for RTxObj using equiv_objects");
 
 $ace = RT::Model::ACE->new(current_user => RT->system_user);
-($id, $msg) = $ace->RT::Record::create( principal_id => $group->id, type => 'Group', right_name => 'RTxUserright', object_type => 'RTx::System::Record', object_id => 5 );
+($id, $msg) = $ace->RT::Record::create( principal => $group->id, type => 'Group', right_name => 'RTxUserright', object_type => 'RTx::System::Record', object_id => 5 );
 ok ($id, "ACL for RTxObj Created");
 
 my $RTxObj2 = {};

Modified: rt/3.999/trunk/t/shredder/02queue.t
==============================================================================
--- rt/3.999/trunk/t/shredder/02queue.t	(original)
+++ rt/3.999/trunk/t/shredder/02queue.t	Tue Mar 31 06:51:57 2009
@@ -106,7 +106,7 @@
 
     ($id, $msg) = $queue->add_watcher(
         type   => 'Cc',
-        principal_id => $group->id,
+        principal => $group->id,
     );
     ok($id, 'added watcher') or diag "error: $msg";
 


More information about the Rt-commit mailing list