[Rt-commit] r15777 - in rt/branches/3.999-DANGEROUS: lib/RT lib/RT/Interface/Email/Auth lib/RT/Model lib/RT/Shredder share/html/Admin/Groups share/html/User/Elements t t/api t/delegation t/mail t/maildigest t/shredder t/web
ruz at bestpractical.com
ruz at bestpractical.com
Thu Sep 4 23:45:35 EDT 2008
Author: ruz
Date: Thu Sep 4 23:45:31 2008
New Revision: 15777
Modified:
rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm
rt/branches/3.999-DANGEROUS/lib/RT/CurrentUser.pm
rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email/Auth/MailFrom.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/ACE.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
rt/branches/3.999-DANGEROUS/lib/RT/SharedSetting.pm
rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Group.pm
rt/branches/3.999-DANGEROUS/lib/RT/Shredder/User.pm
rt/branches/3.999-DANGEROUS/lib/RT/Test.pm
rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html
rt/branches/3.999-DANGEROUS/share/html/User/Elements/DelegateRights
rt/branches/3.999-DANGEROUS/t/api/ace.t
rt/branches/3.999-DANGEROUS/t/api/group.t
rt/branches/3.999-DANGEROUS/t/api/groups.t
rt/branches/3.999-DANGEROUS/t/api/rights.t
rt/branches/3.999-DANGEROUS/t/api/ticket.t
rt/branches/3.999-DANGEROUS/t/api/user.t
rt/branches/3.999-DANGEROUS/t/api/users.t
rt/branches/3.999-DANGEROUS/t/cron.t
rt/branches/3.999-DANGEROUS/t/delegation/cleanup_stalled.t
rt/branches/3.999-DANGEROUS/t/delegation/revocation.t
rt/branches/3.999-DANGEROUS/t/mail/gateway.t
rt/branches/3.999-DANGEROUS/t/mail/gnupg-realmail.t
rt/branches/3.999-DANGEROUS/t/mail/sendmail.t
rt/branches/3.999-DANGEROUS/t/maildigest/attributes.t
rt/branches/3.999-DANGEROUS/t/savedsearch.t
rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t
rt/branches/3.999-DANGEROUS/t/shredder/02queue.t
rt/branches/3.999-DANGEROUS/t/ticket/action_linear_escalate.t
rt/branches/3.999-DANGEROUS/t/ticket/add-watchers.t
rt/branches/3.999-DANGEROUS/t/ticket/deferred_owner.t
rt/branches/3.999-DANGEROUS/t/ticket/linking.t
rt/branches/3.999-DANGEROUS/t/ticket/pawsort.t
rt/branches/3.999-DANGEROUS/t/ticket/search_by_watcher.t
rt/branches/3.999-DANGEROUS/t/ticket/sort-by-user.t
rt/branches/3.999-DANGEROUS/t/web/cf_access.t
rt/branches/3.999-DANGEROUS/t/web/command_line.t
rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t
rt/branches/3.999-DANGEROUS/t/web/custom_frontpage.t
rt/branches/3.999-DANGEROUS/t/web/dashboards-groups.t
rt/branches/3.999-DANGEROUS/t/web/dashboards.t
rt/branches/3.999-DANGEROUS/t/web/rights.t
rt/branches/3.999-DANGEROUS/t/web/rights1.t
Log:
* principal_object -> principal
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Bootstrap.pm Thu Sep 4 23:45:31 2008
@@ -168,7 +168,7 @@
# push @warns, "User 'Nobody' has global OwnTicket right.";
}
else {
- my ( $val, $msg ) = $user->principal_object->grant_right(
+ my ( $val, $msg ) = $user->principal->grant_right(
right => 'OwnTicket',
object => RT->system,
);
@@ -396,7 +396,7 @@
}
# Grant it
- my ( $return, $msg ) = $princ->principal_object->grant_right(
+ my ( $return, $msg ) = $princ->principal->grant_right(
right => $item->{'right'},
object => $object
);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/CurrentUser.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/CurrentUser.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/CurrentUser.pm Thu Sep 4 23:45:31 2008
@@ -171,9 +171,9 @@
sub name { shift->user_object->name }
sub real_name { shift->user_object->real_name }
-sub principal_object {
+sub principal {
my $self = shift;
Carp::confess unless ( $self->user_object );
- return $self->user_object->principal_object;
+ return $self->user_object->principal;
}
1;
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email/Auth/MailFrom.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email/Auth/MailFrom.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email/Auth/MailFrom.pm Thu Sep 4 23:45:31 2008
@@ -104,11 +104,11 @@
# check to see whether "Everyone" or "Unprivileged users" can comment on tickets
unless (
- $everyone->principal_object->has_right(
+ $everyone->principal->has_right(
object => $args{'queue'},
right => 'CommentOnTicket'
)
- || $unpriv->principal_object->has_right(
+ || $unpriv->principal->has_right(
object => $args{'queue'},
right => 'CommentOnTicket'
)
@@ -121,11 +121,11 @@
# check to see whether "Everybody" or "Unprivileged users" can correspond on tickets
unless (
- $everyone->principal_object->has_right(
+ $everyone->principal->has_right(
object => $args{'queue'},
right => 'ReplyToTicket'
)
- || $unpriv->principal_object->has_right(
+ || $unpriv->principal->has_right(
object => $args{'queue'},
right => 'ReplyToTicket'
)
@@ -138,11 +138,11 @@
# check to see whether "Everybody" or "Unprivileged users" can correspond on tickets
unless (
- $everyone->principal_object->has_right(
+ $everyone->principal->has_right(
object => $args{'queue'},
right => 'OwnTicket'
)
- || $unpriv->principal_object->has_right(
+ || $unpriv->principal->has_right(
object => $args{'queue'},
right => 'OwnTicket'
)
@@ -156,11 +156,11 @@
# check to see whether "Everybody" or "Unprivileged users" can correspond on tickets
unless (
- $everyone->principal_object->has_right(
+ $everyone->principal->has_right(
object => $args{'queue'},
right => 'ModifyTicket'
)
- || $unpriv->principal_object->has_right(
+ || $unpriv->principal->has_right(
object => $args{'queue'},
right => 'ModifyTicket'
)
@@ -182,11 +182,11 @@
# check to see whether "Everybody" or "Unprivileged users" can create tickets in this queue
unless (
- $everyone->principal_object->has_right(
+ $everyone->principal->has_right(
object => $args{'queue'},
right => 'CreateTicket'
)
- || $unpriv->principal_object->has_right(
+ || $unpriv->principal->has_right(
object => $args{'queue'},
right => 'ModifyTicket'
)
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/ACE.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/ACE.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/ACE.pm Thu Sep 4 23:45:31 2008
@@ -79,7 +79,7 @@
type => max_length is 25,
type is 'varchar(25)', default is '';
column principal_id => references RT::Model::Principal;
- column right_name => max_length is 25, type is 'varchar(25)', default is '';
+ column right_name => max_length is 25, type is 'varchar(25)', is mandatory;
column
object_type => max_length is 25,
type is 'varchar(25)', default is '';
@@ -377,10 +377,10 @@
return ( 0, _("Permission Denied") );
}
- unless ( $self->principal_object->is_group ) {
+ unless ( $self->principal->is_group ) {
return ( 0, _("System Error") );
}
- unless ( $self->principal_object->object->has_member_recursively( $self->current_user->principal_object ) ) {
+ unless ( $self->principal->object->has_member_recursively( $self->current_user->principal ) ) {
return ( 0, _("Permission Denied") );
}
@@ -479,7 +479,7 @@
# revoke all rights delegated by the recipient.
my $right = $self->__value('right_name');
if ( $right eq 'DelegateRights' || $right eq 'SuperUser' ) {
- my ($status) = $self->principal_object->_cleanup_invalid_delegations;
+ my ($status) = $self->principal->_cleanup_invalid_delegations;
unless ( $status ) {
Jifty->handle->rollback unless $inside_transaction;
return ( 0, _('Right could not be revoked') );
@@ -579,23 +579,14 @@
-=head2 principal_object
+=head2 principal
-Returns the RT::Model::Principal object for this ACE.
+Returns the L<RT::Model::Principal> object for this ACE.
=cut
sub principal_object {
- my $self = shift;
-
- my $princ_obj = RT::Model::Principal->new;
- $princ_obj->load( $self->__value('principal_id') );
-
- unless ( $princ_obj->id ) {
- Jifty->log->err( "ACE " . $self->id . " couldn't load its principal object - " . $self->__value('principal_id') );
- }
- return ($princ_obj);
-
+ require Carp; Carp::confess("deprecated");
}
@@ -613,8 +604,8 @@
if ( $self->__value('delegated_by') eq $self->current_user->id ) {
return ( $self->__value(@_) );
- } elsif ( $self->principal_object->is_group
- && $self->principal_object->object->has_member_recursively( $self->current_user->principal_object ) )
+ } elsif ( $self->principal->is_group
+ && $self->principal->object->has_member_recursively( $self->current_user->principal ) )
{
return ( $self->__value(@_) );
} elsif (
@@ -666,7 +657,7 @@
Jifty->log->fatal( "No ACL equiv group for princ " . $princ_obj->id );
return ( RT::Model::Principal->new( current_user => RT->system_user ), undef );
}
- $princ_obj = $equiv_group->principal_object();
+ $princ_obj = $equiv_group->principal();
$princ_type = 'Group';
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm Thu Sep 4 23:45:31 2008
@@ -436,9 +436,9 @@
# cached members. thankfully, we're creating the group now...so it has no members.
my $cgm = RT::Model::CachedGroupMember->new;
$cgm->create(
- group => $self->principal_object,
- member => $self->principal_object,
- immediate_parent => $self->principal_object
+ group => $self->principal,
+ member => $self->principal,
+ immediate_parent => $self->principal
);
if ( $args{'_record_transaction'} ) {
@@ -510,7 +510,7 @@
# and so we bypass all sorts of cruft we don't need
my $aclstash = RT::Model::GroupMember->new;
my ( $stash_id, $add_msg ) = $aclstash->_stash_user(
- group => $self->principal_object,
+ group => $self->principal,
member => $princ
);
@@ -664,7 +664,7 @@
}
}
Jifty->handle->begin_transaction();
- $self->principal_object->set_disabled($val);
+ $self->principal->set_disabled($val);
# Find all occurrences of this member as a member of this group
# in the cache and nuke them, recursively.
@@ -709,7 +709,7 @@
sub disabled {
my $self = shift;
- $self->principal_object->disabled(@_);
+ $self->principal->disabled(@_);
}
@@ -955,7 +955,7 @@
);
}
if ( $new_member_obj->is_group
- && $new_member_obj->object->has_member_recursively( $self->principal_object ) )
+ && $new_member_obj->object->has_member_recursively( $self->principal ) )
{
#This group can't be made to be a member of itself
@@ -965,7 +965,7 @@
my $member_object = RT::Model::GroupMember->new;
my $id = $member_object->create(
member => $new_member_obj,
- group => $self->principal_object,
+ group => $self->principal,
);
if ($id) {
return ( 1,
@@ -1277,25 +1277,25 @@
-=head2 principal_object
+=head2 principal
Returns the principal object for this user. returns an empty RT::Model::Principal
if there's no principal object matching this user.
-The response is cached. principal_object should never ever change.
+The response is cached. principal should never ever change.
=cut
-sub principal_object {
+sub principal {
my $self = shift;
- unless ( $self->{'principal_object'} && $self->{'principal_object'}->id ) {
- $self->{'principal_object'} = RT::Model::Principal->new;
- $self->{'principal_object'}->load_by_cols(
+ unless ( $self->{'principal'} && $self->{'principal'}->id ) {
+ $self->{'principal'} = RT::Model::Principal->new;
+ $self->{'principal'}->load_by_cols(
id => $self->id,
type => 'Group'
);
}
- return $self->{'principal_object'};
+ return $self->{'principal'};
}
=head2 principal_id
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Queue.pm Thu Sep 4 23:45:31 2008
@@ -821,7 +821,7 @@
# {{{ Check ACLS
#If the watcher we're trying to add is for the current user
if ( defined $args{'principal_id'}
- and $self->current_user->principal_object->id eq $args{'principal_id'} )
+ and $self->current_user->principal->id eq $args{'principal_id'} )
{
# If it's an AdminCc and they don't have
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Ticket.pm Thu Sep 4 23:45:31 2008
@@ -2763,7 +2763,7 @@
my $self = shift;
my $right = shift;
- return $self->current_user->principal_object->has_right(
+ return $self->current_user->principal->has_right(
object => $self,
right => $right,
);
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Transaction.pm Thu Sep 4 23:45:31 2008
@@ -348,8 +348,8 @@
}
if ( my $o = delete $args{'object'} ) {
- $args{'object_type'} = ref $args{'object'};
- $args{'object_id'} = $args{'object'}->id;
+ $args{'object_type'} = ref $o;
+ $args{'object_id'} = $o->id;
}
my $activate_scrips = delete $args{'activate_scrips'};
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm Thu Sep 4 23:45:31 2008
@@ -338,12 +338,12 @@
}
if ($val) {
- if ( $priv->has_member( $self->principal_object ) ) {
+ if ( $priv->has_member( $self->principal ) ) {
#Jifty->log->debug("That user is already privileged");
return ( 0, _("That user is already privileged") );
}
- if ( $unpriv->has_member( $self->principal_object ) ) {
+ if ( $unpriv->has_member( $self->principal ) ) {
$unpriv->_delete_member( $self->principal_id );
} else {
@@ -361,12 +361,12 @@
return ( 0, $msg );
}
} else {
- if ( $unpriv->has_member( $self->principal_object ) ) {
+ if ( $unpriv->has_member( $self->principal ) ) {
#Jifty->log->debug("That user is already unprivileged");
return ( 0, _("That user is already unprivileged") );
}
- if ( $priv->has_member( $self->principal_object ) ) {
+ if ( $priv->has_member( $self->principal ) ) {
$priv->_delete_member( $self->principal_id );
} else {
@@ -397,7 +397,7 @@
my $self = shift;
my $priv = RT::Model::Group->new;
$priv->load_system_internal_group('privileged');
- if ( $priv->has_member( $self->principal_object ) ) {
+ if ( $priv->has_member( $self->principal ) ) {
return (1);
} else {
return (undef);
@@ -793,7 +793,7 @@
{
return ( 0, _('Permission Denied') );
}
- return $self->principal_object->set_disabled(@_);
+ return $self->principal->set_disabled(@_);
}
=head2 disabled
@@ -804,19 +804,19 @@
sub disabled {
my $self = shift;
- return $self->principal_object->disabled(@_);
+ return $self->principal->disabled(@_);
}
-=head2 principal_object
+=head2 principal
Returns the principal object for this user. returns an empty RT::Model::Principal
if there's no principal object matching this user.
-The response is cached. principal_object should never ever change.
+The response is cached. principal should never ever change.
=cut
-sub principal_object {
+sub principal {
my $self = shift;
unless ( $self->id ) {
@@ -923,7 +923,7 @@
sub has_right {
my $self = shift;
- return $self->principal_object->has_right(@_);
+ return $self->principal->has_right(@_);
}
Modified: rt/branches/3.999-DANGEROUS/lib/RT/SharedSetting.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/SharedSetting.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/SharedSetting.pm Thu Sep 4 23:45:31 2008
@@ -432,7 +432,7 @@
if ( $obj_type eq 'RT::Model::Group'
&& !$object->has_member_recursively(
- $self->current_user->principal_object ) )
+ $self->current_user->principal ) )
{
Jifty->log->debug( "Permission denied, "
. $self->current_user->name
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Group.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Group.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/Group.pm Thu Sep 4 23:45:31 2008
@@ -86,7 +86,7 @@
$deps->_push_dependency(
base_object => $self,
flags => DEPENDS_ON | WIPE_AFTER,
- target_object => $self->principal_object,
+ target_object => $self->principal,
shredder => $args{'shredder'}
);
@@ -152,7 +152,7 @@
}
# Principal
- my $obj = $self->principal_object;
+ my $obj = $self->principal;
if ( $obj && $obj->id ) {
push( @$list, $obj );
} else {
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Shredder/User.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Shredder/User.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Shredder/User.pm Thu Sep 4 23:45:31 2008
@@ -91,7 +91,7 @@
$deps->_push_dependency(
base_object => $self,
flags => DEPENDS_ON | WIPE_AFTER,
- target_object => $self->principal_object,
+ target_object => $self->principal,
shredder => $args{'shredder'}
);
@@ -147,7 +147,7 @@
my $list = [];
# Principal
- my $obj = $self->principal_object;
+ my $obj = $self->principal;
if ( $obj && defined $obj->id ) {
push( @$list, $obj );
} else {
@@ -158,7 +158,7 @@
}
$obj = RT::Model::Group->new( current_user => RT->system_user );
- $obj->load_acl_equivalence_group( $self->principal_object );
+ $obj->load_acl_equivalence_group( $self->principal );
if ( $obj && defined $obj->id ) {
push( @$list, $obj );
} else {
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Test.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Test.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Test.pm Thu Sep 4 23:45:31 2008
@@ -294,7 +294,7 @@
my @res;
while ( my $ace = $acl->next ) {
- my $obj = $ace->principal_object->object;
+ my $obj = $ace->principal->object;
if ( $obj->isa('RT::Model::Group')
&& $obj->type eq 'UserEquiv'
&& $obj->instance == RT->nobody->id )
@@ -334,7 +334,7 @@
value => 'SuperUser'
);
while ( my $ace = $acl->next ) {
- my $obj = $ace->principal_object->object;
+ my $obj = $ace->principal->object;
if ( $obj->isa('RT::Model::Group')
&& $obj->type eq 'UserEquiv'
&& $obj->instance == RT->nobody->id )
@@ -362,8 +362,8 @@
}
}
unless ( $principal->isa('RT::Model::Principal') ) {
- if ( $principal->can('principal_object') ) {
- $principal = $principal->principal_object;
+ if ( $principal->can('principal') ) {
+ $principal = $principal->principal;
}
}
my @Rights = ref $e->{'right'} ? @{ $e->{'right'} } : ( $e->{'right'} );
Modified: rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html Thu Sep 4 23:45:31 2008
@@ -80,7 +80,7 @@
<ul>
% while ( my $user = $Users->next ) {
% $UsersSeen{ $user->id } = 1 if $skip_seen_users;
-<li><input type="checkbox" class="checkbox" name="delete_member-<% $user->principal_object->id %>" value="1" />
+<li><input type="checkbox" class="checkbox" name="delete_member-<% $user->principal->id %>" value="1" />
<& '/Elements/ShowUser', user => $user &></li>
% }
</ul>
Modified: rt/branches/3.999-DANGEROUS/share/html/User/Elements/DelegateRights
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/User/Elements/DelegateRights (original)
+++ rt/branches/3.999-DANGEROUS/share/html/User/Elements/DelegateRights Thu Sep 4 23:45:31 2008
@@ -79,7 +79,7 @@
<tr class="<%($i%2) && 'oddline'%>">
<td>
<% _($right->right_name) %><br />
-<div align="right"><font size="-2" color="#999999"><&|/l, $right->principal_object->object->self_description &>as granted to %1</&></font></div>
+<div align="right"><font size="-2" color="#999999"><&|/l, $right->principal->object->self_description &>as granted to %1</&></font></div>
</td>
% while (my $pg = $personalgroups->next) {
<td align="center">
Modified: rt/branches/3.999-DANGEROUS/t/api/ace.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/ace.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/ace.t Thu Sep 4 23:45:31 2008
@@ -34,10 +34,10 @@
ok ($q->id, "Created a delegation test queue");
#------ First, we test whether a user can delegate a right that's been granted to him personally
-my ($val, $msg) = $user_a->principal_object->grant_right(object => RT->system, right => 'AdminOwnPersonalGroups');
+my ($val, $msg) = $user_a->principal->grant_right(object => RT->system, right => 'AdminOwnPersonalGroups');
ok($val, $msg);
-($val, $msg) = $user_a->principal_object->grant_right(object =>$q, right => 'OwnTicket');
+($val, $msg) = $user_a->principal->grant_right(object =>$q, right => 'OwnTicket');
ok($val, $msg);
ok($user_a->has_right( object => RT->system, right => 'AdminOwnPersonalGroups') ,"user a has the right 'AdminOwnPersonalGroups' directly");
@@ -54,10 +54,10 @@
my $own_ticket_ace = RT::Model::ACE->new(current_user => $user_a);
my $user_a_equiv_group = RT::Model::Group->new(current_user => $user_a);
-$user_a_equiv_group->load_acl_equivalence_group($user_a->principal_object);
+$user_a_equiv_group->load_acl_equivalence_group($user_a->principal);
ok ($user_a_equiv_group->id, "Loaded the user A acl equivalence group");
my $user_b_equiv_group = RT::Model::Group->new(current_user => $user_b);
-$user_b_equiv_group->load_acl_equivalence_group($user_b->principal_object);
+$user_b_equiv_group->load_acl_equivalence_group($user_b->principal);
ok ($user_b_equiv_group->id, "Loaded the user B acl equivalence group");
$own_ticket_ace->load_by_values( type => 'Group', principal_id => $user_a_equiv_group->principal_id, object=>$q, right_name => 'OwnTicket');
@@ -68,7 +68,7 @@
ok( !$val ,"user a tries and fails to delegate the right 'ownticket' in queue 'DelegationTest' to personal group 'delegates' - $msg");
-($val, $msg) = $user_a->principal_object->grant_right( right => 'DelegateRights');
+($val, $msg) = $user_a->principal->grant_right( right => 'DelegateRights');
ok($val, "user a is granted the right to 'delegate rights' - $msg");
ok($user_a->has_right( object => RT->system, right => 'DelegateRights') ,"user a has the right 'DeletgateRights'");
@@ -94,14 +94,14 @@
ok( $user_b->has_right(right => 'OwnTicket', object => $q) ,"user b has the right to own tickets in queue 'DelegationTest'");
-($val, $msg) = $user_a->principal_object->revoke_right(object=>$q, right => 'OwnTicket');
+($val, $msg) = $user_a->principal->revoke_right(object=>$q, right => 'OwnTicket');
ok($val, "Revoked user a's right to own tickets in queue 'DelegationTest". $msg);
ok( !$user_a->has_right(right => 'OwnTicket', object => $q) ,"user a does not have the right to own tickets in queue 'DelegationTest'");
ok( !$user_b->has_right(right => 'OwnTicket', object => $q) ,"user b does not have the right to own tickets in queue 'DelegationTest'");
-($val, $msg) = $user_a->principal_object->grant_right(object=>$q, right => 'OwnTicket');
+($val, $msg) = $user_a->principal->grant_right(object=>$q, right => 'OwnTicket');
ok($val, $msg);
ok( $user_a->has_right(right => 'OwnTicket', object => $q) ,"user a has the right to own tickets in queue 'DelegationTest'");
@@ -109,7 +109,7 @@
ok( !$user_b->has_right(right => 'OwnTicket', object => $q) ,"user b does not have the right to own tickets in queue 'DelegationTest'");
# {{{ get back to a known clean state
-($val, $msg) = $user_a->principal_object->revoke_right( object => $q, right => 'OwnTicket');
+($val, $msg) = $user_a->principal->revoke_right( object => $q, right => 'OwnTicket');
ok($val, "Revoked user a's right to own tickets in queue 'DelegationTest -". $msg);
ok( !$user_a->has_right(right => 'OwnTicket', object => $q) ,"make sure that user a can't own tickets in queue 'DelegationTest'");
# }}}
@@ -148,7 +148,7 @@
# {{{ Grant a right to a group and make sure that a submember can delegate the right and that it does not get yanked
# when a user is removed as a submember, when they're a submember through another path
-($val, $msg) = $del1->principal_object->grant_right( object=> $q, right => 'OwnTicket');
+($val, $msg) = $del1->principal->grant_right( object=> $q, right => 'OwnTicket');
ok( $val ,"grant del1 the right to 'OwnTicket' in queue 'DelegationTest' - $msg");
ok( $user_a->has_right(right => 'OwnTicket', object => $q) ,"make sure that user a can own tickets in queue 'DelegationTest'");
@@ -181,7 +181,7 @@
($val, $msg) = $del2->add_member($user_a->principal_id);
ok( $val ,"make user a a member of group del2 - $msg");
-($val, $msg) = $del2->principal_object->grant_right(object=>$q, right => 'OwnTicket');
+($val, $msg) = $del2->principal->grant_right(object=>$q, right => 'OwnTicket');
ok($val, "grant the right 'own tickets' in queue 'DelegationTest' to group del2 - $msg");
my $del2_right = RT::Model::ACE->new(current_user => $user_a);
@@ -195,12 +195,12 @@
ok( $user_b->has_right(right => 'OwnTicket', object => $q) ,"user b has the right to own tickets in queue 'DelegationTest'");
-($val, $msg) = $del2->principal_object->revoke_right(object=>$q, right => 'OwnTicket');
+($val, $msg) = $del2->principal->revoke_right(object=>$q, right => 'OwnTicket');
ok($val, "revoke the right 'own tickets' in queue 'DelegationTest' to group del2 - $msg");
ok( $user_a->has_right(right => 'OwnTicket', object => $q) ,"user a does has the right to own tickets in queue 'DelegationTest' via del1");
ok( !$user_b->has_right(right => 'OwnTicket', object => $q) ,"user b does not have the right to own tickets in queue 'DelegationTest'");
-($val, $msg) = $del2->principal_object->grant_right(object=>$q, right => 'OwnTicket');
+($val, $msg) = $del2->principal->grant_right(object=>$q, right => 'OwnTicket');
ok($val, "grant the right 'own tickets' in queue 'DelegationTest' to group del2 - $msg");
Modified: rt/branches/3.999-DANGEROUS/t/api/group.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/group.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/group.t Thu Sep 4 23:45:31 2008
@@ -92,7 +92,7 @@
ok(my $u = RT::Model::Group->new(current_user => RT->system_user));
ok($u->load(4), "Loaded the first user");
-is($u->principal_object->type , 'Group' , "Principal 4 is a group");
+is($u->principal->type , 'Group' , "Principal 4 is a group");
}
Modified: rt/branches/3.999-DANGEROUS/t/api/groups.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/groups.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/groups.t Thu Sep 4 23:45:31 2008
@@ -39,7 +39,7 @@
my ($aid, $amsg) =$g->add_member($u->id);
ok ($aid, $amsg);
-ok($g->has_member($u->principal_object),"G has member u");
+ok($g->has_member($u->principal),"G has member u");
my $groups = RT::Model::GroupCollection->new(current_user => RT->system_user);
$groups->limit_to_user_defined_groups();
@@ -67,7 +67,7 @@
my $groups = RT::Model::GroupCollection->new(current_user => RT->system_user);
$groups->with_right(right => 'OwnTicket', object => $q);
is($groups->count, 1);
-($id, $msg) = $global_admin_cc->principal_object->grant_right(right =>'OwnTicket', object=> RT->system);
+($id, $msg) = $global_admin_cc->principal->grant_right(right =>'OwnTicket', object=> RT->system);
ok ($id,$msg);
ok (!$testuser->has_right(object => $q, right => 'OwnTicket') , "The test user does not have the right to own tickets in the test queue");
($id, $msg) = $q->add_watcher(type => 'admin_cc', principal_id => $testuser->id);
Modified: rt/branches/3.999-DANGEROUS/t/api/rights.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/rights.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/rights.t Thu Sep 4 23:45:31 2008
@@ -89,9 +89,9 @@
my $group = RT::Model::Group->new(current_user => RT->system_user );
ok( $group->load_queue_role_group( queue => $queue_id, type=> 'owner' ), "load queue owners role group" );
my $ace = RT::Model::ACE->new(current_user => RT->system_user );
-my ($ace_id, $msg) = $group->principal_object->grant_right( right => 'ReplyToTicket', object => $queue );
+my ($ace_id, $msg) = $group->principal->grant_right( right => 'ReplyToTicket', object => $queue );
ok( $ace_id, "Granted queue owners role group with ReplyToTicket right: $msg" );
-ok( $group->principal_object->has_right( right => 'ReplyToTicket', object => $queue ), "role group can reply to ticket" );
+ok( $group->principal->has_right( right => 'ReplyToTicket', object => $queue ), "role group can reply to ticket" );
ok( !$user->has_right( right => 'ReplyToTicket', object => $queue ), "user can't reply to ticket" );
# new ticket
@@ -101,7 +101,7 @@
is( $ticket->owner, RT->nobody->id, 'owner of the new ticket is nobody' );
my $status;
-($status, $msg) = $user->principal_object->grant_right( object => $queue, right => 'OwnTicket' );
+($status, $msg) = $user->principal->grant_right( object => $queue, right => 'OwnTicket' );
ok( $status, "successfuly granted right: $msg" );
ok( $user->has_right( right => 'OwnTicket', object => $queue ), "user can own ticket" );
@@ -115,9 +115,9 @@
$group = RT::Model::Group->new(current_user => RT->system_user );
ok( $group->load_queue_role_group( queue => $queue_id, type=> 'admin_cc' ), "load queue admin_cc role group" );
$ace = RT::Model::ACE->new(current_user => RT->system_user );
-($ace_id, $msg) = $group->principal_object->grant_right( right => 'ModifyTicket', object => $queue );
+($ace_id, $msg) = $group->principal->grant_right( right => 'ModifyTicket', object => $queue );
ok( $ace_id, "Granted queue admin_cc role group with ModifyTicket right: $msg" );
-ok( $group->principal_object->has_right( right => 'ModifyTicket', object => $queue ), "role group can modify ticket" );
+ok( $group->principal->has_right( right => 'ModifyTicket', object => $queue ), "role group can modify ticket" );
ok( !$user->has_right( right => 'ModifyTicket', object => $ticket ), "user is not admin_cc and can't modify ticket" );
($status, $msg) = $ticket->add_watcher(type => 'admin_cc', principal_id => $user->principal_id);
ok( $status, "successfuly added user as admin_cc");
Modified: rt/branches/3.999-DANGEROUS/t/api/ticket.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/ticket.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/ticket.t Thu Sep 4 23:45:31 2008
@@ -137,7 +137,7 @@
$group = RT::Model::Group->new(current_user => RT->system_user);
ok($group->load_ticket_role_group(ticket => $id, type=> 'owner'));
ok ($group->id, "Found the owner object for this ticket");
-ok($group->has_member(RT->nobody->user_object->principal_object), "the owner group has the member 'RT_System'");
+ok($group->has_member(RT->nobody->user_object->principal), "the owner group has the member 'RT_System'");
Modified: rt/branches/3.999-DANGEROUS/t/api/user.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/user.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/user.t Thu Sep 4 23:45:31 2008
@@ -87,7 +87,7 @@
ok(my $u = RT::Model::User->new(current_user => RT->system_user));
ok($u->load(1), "Loaded the first user");
-is($u->principal_object->type, 'User' , "Principal 1 is a user, not a group");
+is($u->principal->type, 'User' , "Principal 1 is a user, not a group");
}
@@ -114,12 +114,12 @@
ok (!$q->current_user->has_right(right => 'CreateTicket', object => $q), "Some random user doesn't have the right to create tickets");
-ok (my ($gval, $gmsg) = $new_user->principal_object->grant_right( right => 'CreateTicket', object => $q), "Granted the random user the right to create tickets");
+ok (my ($gval, $gmsg) = $new_user->principal->grant_right( right => 'CreateTicket', object => $q), "Granted the random user the right to create tickets");
ok ($gval, "Grant succeeded - $gmsg");
ok ($q->current_user->has_right(right => 'CreateTicket', object => $q), "The user can create tickets after we grant him the right");
-ok ( ($gval, $gmsg) = $new_user->principal_object->revoke_right( right => 'CreateTicket', object => $q), "revoked the random user the right to create tickets");
+ok ( ($gval, $gmsg) = $new_user->principal->revoke_right( right => 'CreateTicket', object => $q), "revoked the random user the right to create tickets");
ok ($gval, "Revocation succeeded - $gmsg");
ok (!$q->current_user->has_right(right => 'CreateTicket', object => $q), "The user can't create tickets anymore");
@@ -138,7 +138,7 @@
$group->create_user_defined_group(name => 'ACLTest'.$$);
ok($group->id, "Created a new group Ok");
# Grant a group the right to modify tickets in a queue
-ok(my ($gv,$gm) = $group->principal_object->grant_right( object => $q, right => 'ModifyTicket'),"Granted the group the right to modify tickets");
+ok(my ($gv,$gm) = $group->principal->grant_right( object => $q, right => 'ModifyTicket'),"Granted the group the right to modify tickets");
ok($gv,"Grant succeeed - $gm");
# Add the user to the group
ok( my ($aid, $amsg) = $group->add_member($new_user->principal_id), "Added the member to the group");
@@ -207,13 +207,13 @@
ok (!$new_user->has_right( object => $new_tick2, right => 'ModifyTicket'), "User can't modify the ticket without group membership");
#revoke the right to modify tickets in a queue
-ok(($gv,$gm) = $group->principal_object->revoke_right( object => $q, right => 'ModifyTicket'),"Granted the group the right to modify tickets");
+ok(($gv,$gm) = $group->principal->revoke_right( object => $q, right => 'ModifyTicket'),"Granted the group the right to modify tickets");
ok($gv,"revoke succeeed - $gm");
# {{{ Test the user's right to modify a ticket as a _queue_ admincc for a Right granted at the _queue_ level
# Grant queue admin cc the right to modify ticket in the queue
-ok(my ($qv,$qm) = $q_as_system->role_group("admin_cc")->principal_object->grant_right( object => $q_as_system, right => 'ModifyTicket'),"Granted the queue adminccs the right to modify tickets");
+ok(my ($qv,$qm) = $q_as_system->role_group("admin_cc")->principal->grant_right( object => $q_as_system, right => 'ModifyTicket'),"Granted the queue adminccs the right to modify tickets");
ok($qv, "Granted the right successfully - $qm");
# Add the user as a queue admincc
@@ -247,7 +247,7 @@
# Revoke the right to modify ticket in the queue
-ok(my ($rqv,$rqm) = $q_as_system->role_group("admin_cc")->principal_object->revoke_right( object => $q_as_system, right => 'ModifyTicket'),"Revokeed the queue adminccs the right to modify tickets");
+ok(my ($rqv,$rqm) = $q_as_system->role_group("admin_cc")->principal->revoke_right( object => $q_as_system, right => 'ModifyTicket'),"Revokeed the queue adminccs the right to modify tickets");
ok($rqv, "Revoked the right successfully - $rqm");
# }}}
@@ -261,7 +261,7 @@
ok (!$new_user->has_right( object => $new_tick2->queue, right => 'ModifyTicket'), "User can not modify tickets in the queue without it being granted");
# Grant queue admin cc the right to modify ticket in the queue
-ok(($qv,$qm) = $q_as_system->role_group("admin_cc")->principal_object->grant_right( object => RT->system, right => 'ModifyTicket'),"Granted the queue adminccs the right to modify tickets");
+ok(($qv,$qm) = $q_as_system->role_group("admin_cc")->principal->grant_right( object => RT->system, right => 'ModifyTicket'),"Granted the queue adminccs the right to modify tickets");
ok($qv, "Granted the right successfully - $qm");
# Make sure the user can't modify the ticket before they're added as a watcher
@@ -307,7 +307,7 @@
# Revoke the right to modify ticket in the queue
-ok(($rqv,$rqm) = $q_as_system->role_group("admin_cc")->principal_object->revoke_right( object => RT->system, right => 'ModifyTicket'),"Revokeed the queue adminccs the right to modify tickets");
+ok(($rqv,$rqm) = $q_as_system->role_group("admin_cc")->principal->revoke_right( object => RT->system, right => 'ModifyTicket'),"Revokeed the queue adminccs the right to modify tickets");
ok($rqv, "Revoked the right successfully - $rqm");
# }}}
Modified: rt/branches/3.999-DANGEROUS/t/api/users.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/users.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/users.t Thu Sep 4 23:45:31 2008
@@ -21,7 +21,7 @@
ok ($id,$msg);
my $group = RT::Model::Group->new(current_user => RT->system_user);
-$group->load_acl_equivalence_group($RTxUser->principal_object);
+$group->load_acl_equivalence_group($RTxUser->principal);
my $RTxSysObj = {};
bless $RTxSysObj, 'RTx::System';
*RTx::System::Id = sub { 1; };
Modified: rt/branches/3.999-DANGEROUS/t/cron.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/cron.t (original)
+++ rt/branches/3.999-DANGEROUS/t/cron.t Thu Sep 4 23:45:31 2008
@@ -15,7 +15,7 @@
ok($ret, 'record test user creation');
($ret,$msg) =$user_object->set_name('tara');
ok($ret,$msg);
-($ret,$msg) =$user_object->principal_object->grant_right(right => 'SuperUser');
+($ret,$msg) =$user_object->principal->grant_right(right => 'SuperUser');
ok($ret,$msg);
my $CurrentUser = RT::CurrentUser->new(name => 'tara');
is($user_object->name,'tara');
Modified: rt/branches/3.999-DANGEROUS/t/delegation/cleanup_stalled.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/delegation/cleanup_stalled.t (original)
+++ rt/branches/3.999-DANGEROUS/t/delegation/cleanup_stalled.t Thu Sep 4 23:45:31 2008
@@ -85,14 +85,14 @@
clear_acls_and_groups();
( $ret, $msg )
- = $g1->principal_object->grant_right( right => 'DelegateRights' );
+ = $g1->principal->grant_right( right => 'DelegateRights' );
ok( $ret, "Grant DelegateRights to g1: $msg" );
( $ret, $msg )
- = $g2->principal_object->grant_right( right => 'ShowConfigTab' );
+ = $g2->principal->grant_right( right => 'ShowConfigTab' );
ok( $ret, "Grant ShowConfigTab to g2: $msg" );
( $ret, $msg ) = $g1->add_member( $u1->principal_id );
ok( $ret, "Add test user 1 to g1: $msg" );
-ok( $u1->principal_object->has_right(
+ok( $u1->principal->has_right(
right => 'DelegateRights',
object => RT->system
),
@@ -100,7 +100,7 @@
);
( $ret, $msg ) = $g2->add_member( $u1->principal_id );
ok( $ret, "Add test user 1 to g2: $msg" );
-ok( $u1->principal_object->has_right(
+ok( $u1->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
),
@@ -116,7 +116,7 @@
principal_id => $g2->principal_id
);
ok( $ret, "Look up ACE to be delegated: $msg" );
-ok( not($pg1->principal_object->has_right(
+ok( not($pg1->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
)
@@ -126,7 +126,7 @@
( $ret, $msg ) = $ace->delegate( principal_id => $pg1->principal_id );
ok( $ret, "Delegated ShowConfigTab to pg1: $msg" );
-ok( $pg1->principal_object->has_right(
+ok( $pg1->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
),
@@ -136,7 +136,7 @@
( $ret, $msg ) = $g1->delete_member( $u1->principal_id );
ok( $ret, "Delete test user 1 from g1: $msg" );
-ok( not($pg1->principal_object->has_right(
+ok( not($pg1->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
)
@@ -152,9 +152,9 @@
( $ret, $msg ) = $ace->delegate( principal_id => $pg1->principal_id );
ok( $ret, "Delegate ShowConfigTab to pg1: $msg" );
( $ret, $msg )
- = $g1->principal_object->revoke_right( right => 'DelegateRights' );
+ = $g1->principal->revoke_right( right => 'DelegateRights' );
ok( $ret, "Revoke DelegateRights from g1 (" . $g1->id . "): $msg" );
-ok( not($pg1->principal_object->has_right(
+ok( not($pg1->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
)
@@ -168,12 +168,12 @@
clear_acls_and_groups();
-( $ret, $msg ) = $g1->principal_object->grant_right(
+( $ret, $msg ) = $g1->principal->grant_right(
right => 'DelegateRights',
object => $pg1
);
ok( $ret, "Grant DelegateRights on pg1 to g1: $msg" );
-( $ret, $msg ) = $g2->principal_object->grant_right(
+( $ret, $msg ) = $g2->principal->grant_right(
right => 'AdminGroup',
object => $pg1
);
@@ -182,13 +182,13 @@
ok( $ret, "Add test user 1 to g1: $msg" );
( $ret, $msg ) = $g2->add_member( $u1->principal_id );
ok( $ret, "Add test user 1 to g2: $msg" );
-ok( $u1->principal_object->has_right(
+ok( $u1->principal->has_right(
right => 'DelegateRights',
object => $pg1
),
"test user 1 has DelegateRights on pg1 after joining g1"
);
-ok( not($u1->principal_object->has_right(
+ok( not($u1->principal->has_right(
right => 'DelegateRights',
object => RT->system
)
@@ -206,25 +206,25 @@
ok( $ret, "Look up ACE to be delegated: $msg" );
( $ret, $msg ) = $ace->delegate( principal_id => $pg1->principal_id );
ok( $ret, "Delegate AdminGroup on pg1 to pg1: $msg" );
-ok( $pg1->principal_object->has_right(
+ok( $pg1->principal->has_right(
right => 'AdminGroup',
object => $pg1
),
"Test personal group 1 has AdminGroup right on pg1 after delegation"
);
-( $ret, $msg ) = $g1->principal_object->revoke_right(
+( $ret, $msg ) = $g1->principal->revoke_right(
right => 'DelegateRights',
object => $pg1
);
ok( $ret, "Revoke DelegateRights on pg1 from g1: $msg" );
-ok( not($pg1->principal_object->has_right(
+ok( not($pg1->principal->has_right(
right => 'AdminGroup',
object => $pg1
)
),
"Test personal group 1 lacks AdminGroup right on pg1 after DelegateRights revoked from g1"
);
-( $ret, $msg ) = $g1->principal_object->grant_right(
+( $ret, $msg ) = $g1->principal->grant_right(
right => 'DelegateRights',
object => $pg1
);
@@ -235,7 +235,7 @@
ok( $ret, "Grant DelegateRights on pg1 to g1: $msg" );
( $ret, $msg ) = $ace->delegate( principal_id => $pg1->principal_id );
ok( $ret, "Delegate AdminGroup on pg1 to pg1: $msg" );
-ok( $pg1->principal_object->has_right(
+ok( $pg1->principal->has_right(
right => 'AdminGroup',
object => $pg1
),
@@ -243,7 +243,7 @@
);
( $ret, $msg ) = $g1->delete_member( $u1->principal_id );
ok( $ret, "Delete test user 1 from g1: $msg" );
-ok( not($pg1->principal_object->has_right(
+ok( not($pg1->principal->has_right(
right => 'AdminGroup',
object => $pg1
)
@@ -259,17 +259,17 @@
# should remain); then DelegateRights revoked from u (delegation
# should not remain).
-( $ret, $msg ) = $g1->principal_object->grant_right(
+( $ret, $msg ) = $g1->principal->grant_right(
right => 'DelegateRights',
object => $pg1
);
ok( $ret, "Grant DelegateRights on pg1 to g1: $msg" );
-( $ret, $msg ) = $g2->principal_object->grant_right(
+( $ret, $msg ) = $g2->principal->grant_right(
right => 'AdminGroup',
object => $pg1
);
ok( $ret, "Grant AdminGroup on pg1 to g2: $msg" );
-( $ret, $msg ) = $u1->principal_object->grant_right(
+( $ret, $msg ) = $u1->principal->grant_right(
right => 'DelegateRights',
object => RT->system
);
@@ -292,17 +292,17 @@
ok( $ret, "Delegate AdminGroup on pg1 to pg1: $msg" );
( $ret, $msg ) = $g1->delete_member( $u1->principal_id );
ok( $ret, "Delete test user 1 from g1: $msg" );
-ok( $pg1->principal_object->has_right(
+ok( $pg1->principal->has_right(
right => 'AdminGroup',
object => $pg1
),
"Test personal group 1 retains AdminGroup right on pg1 after user removed from g1"
);
-( $ret, $msg ) = $u1->principal_object->revoke_right(
+( $ret, $msg ) = $u1->principal->revoke_right(
right => 'DelegateRights',
object => RT->system
);
-ok( not($pg1->principal_object->has_right(
+ok( not($pg1->principal->has_right(
right => 'AdminGroup',
object => $pg1
)
@@ -319,33 +319,33 @@
( $ret, $msg ) = $g1->add_member( $u1->principal_id );
ok( $ret, "Add test user 1 to g1: $msg" );
-( $ret, $msg ) = $u1->principal_object->grant_right(
+( $ret, $msg ) = $u1->principal->grant_right(
right => 'DelegateRights',
object => RT->system
);
ok( $ret, "Grant DelegateRights to user: $msg" );
-( $ret, $msg ) = $u1->principal_object->grant_right(
+( $ret, $msg ) = $u1->principal->grant_right(
right => 'DelegateRights',
object => $g2
);
ok( $ret, "Grant DelegateRights on g2 to user: $msg" );
( $ret, $msg ) = $ace->delegate( principal_id => $pg1->principal_id );
ok( $ret, "Delegate AdminGroup on pg1 to pg1: $msg" );
-( $ret, $msg ) = $u1->principal_object->revoke_right(
+( $ret, $msg ) = $u1->principal->revoke_right(
right => 'DelegateRights',
object => RT->system
);
-ok( $pg1->principal_object->has_right(
+ok( $pg1->principal->has_right(
right => 'AdminGroup',
object => $pg1
),
"Test personal group 1 retains AdminGroup right on pg1 after global DelegateRights revoked"
);
-( $ret, $msg ) = $u1->principal_object->revoke_right(
+( $ret, $msg ) = $u1->principal->revoke_right(
right => 'DelegateRights',
object => $g2
);
-ok( $pg1->principal_object->has_right(
+ok( $pg1->principal->has_right(
right => 'AdminGroup',
object => $pg1
),
@@ -353,7 +353,7 @@
);
( $ret, $msg ) = $g1->delete_member( $u1->principal_id );
ok( $ret, "Delete test user 1 from g1: $msg" );
-ok( not($pg1->principal_object->has_right(
+ok( not($pg1->principal->has_right(
right => 'AdminGroup',
object => $pg1
)
@@ -368,10 +368,10 @@
clear_acls_and_groups();
( $ret, $msg )
- = $g1->principal_object->grant_right( right => 'DelegateRights' );
+ = $g1->principal->grant_right( right => 'DelegateRights' );
ok( $ret, "Grant DelegateRights to g1: $msg" );
( $ret, $msg )
- = $g2->principal_object->grant_right( right => 'ShowConfigTab' );
+ = $g2->principal->grant_right( right => 'ShowConfigTab' );
ok( $ret, "Grant ShowConfigTab to g2: $msg" );
( $ret, $msg ) = $g1->add_member( $g3->principal_id );
ok( $ret, "Add g3 to g1: $msg" );
@@ -395,7 +395,7 @@
( $ret, $msg ) = $g1->delete_member( $g3->principal_id );
ok( $ret, "Delete g3 from g1: $msg" );
-ok( not($pg1->principal_object->has_right(
+ok( not($pg1->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
)
@@ -412,10 +412,10 @@
( $ret, $msg ) = $ace->delegate( principal_id => $pg1->principal_id );
ok( $ret, "Delegate ShowConfigTab to pg1: $msg" );
( $ret, $msg )
- = $g1->principal_object->revoke_right( right => 'DelegateRights' );
+ = $g1->principal->revoke_right( right => 'DelegateRights' );
ok( $ret, "Revoke DelegateRights from g1: $msg" );
-ok( not($pg1->principal_object->has_right(
+ok( not($pg1->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
)
@@ -430,10 +430,10 @@
clear_acls_and_groups();
( $ret, $msg )
- = $g1->principal_object->grant_right( right => 'DelegateRights' );
+ = $g1->principal->grant_right( right => 'DelegateRights' );
ok( $ret, "Grant DelegateRights to g1: $msg" );
( $ret, $msg )
- = $g2->principal_object->grant_right( right => 'ShowConfigTab' );
+ = $g2->principal->grant_right( right => 'ShowConfigTab' );
ok( $ret, "Grant ShowConfigTab to g2: $msg" );
( $ret, $msg ) = $g1->add_member( $u1->principal_id );
ok( $ret, "Add test user 1 to g1: $msg" );
@@ -467,7 +467,7 @@
( $ret, $msg ) = $ace->delegate( principal_id => $pg2->principal_id );
ok( $ret, "Delegate ShowConfigTab to pg2: $msg" );
-ok( $pg2->principal_object->has_right(
+ok( $pg2->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
),
@@ -475,7 +475,7 @@
);
( $ret, $msg ) = $g1->delete_member( $u1->principal_id );
ok( $ret, "Delete u1 from g1: $msg" );
-ok( not($pg2->principal_object->has_right(
+ok( not($pg2->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
)
@@ -515,9 +515,9 @@
ok( $ret, "Delegate ShowConfigTab to pg2: $msg" );
( $ret, $msg )
- = $g1->principal_object->revoke_right( right => 'DelegateRights' );
+ = $g1->principal->revoke_right( right => 'DelegateRights' );
ok( $ret, "Revoke DelegateRights from g1: $msg" );
-ok( not($pg2->principal_object->has_right(
+ok( not($pg2->principal->has_right(
right => 'ShowConfigTab',
object => RT->system
)
@@ -534,8 +534,8 @@
= RT::Model::ACECollection->new( current_user => RT->system_user );
foreach (@principals) {
$acl->limit_to_principal(
- type => $$_->principal_object->type,
- id => $$_->principal_object->id
+ type => $$_->principal->type,
+ id => $$_->principal->id
);
}
while ( my $ace = $acl->next() ) {
Modified: rt/branches/3.999-DANGEROUS/t/delegation/revocation.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/delegation/revocation.t (original)
+++ rt/branches/3.999-DANGEROUS/t/delegation/revocation.t Thu Sep 4 23:45:31 2008
@@ -45,9 +45,9 @@
clear_acls_and_groups();
-( $ret, $msg ) = $u1->principal_object->grant_right( right => 'DelegateRights' );
+( $ret, $msg ) = $u1->principal->grant_right( right => 'DelegateRights' );
ok( $ret, "Grant DelegateRights to u1: $msg" );
-( $ret, $msg ) = $g1->principal_object->grant_right( right => 'ShowConfigTab' );
+( $ret, $msg ) = $g1->principal->grant_right( right => 'ShowConfigTab' );
ok( $ret, "Grant ShowConfigTab to g1: $msg" );
( $ret, $msg ) = $g1->add_member( $u1->principal_id );
ok( $ret, "Add test user 1 to g1: $msg" );
@@ -65,19 +65,19 @@
( $ret, $msg ) = $ace->delegate( principal_id => $pg2->principal_id );
ok( $ret, "Delegate ShowConfigTab to pg2: $msg" );
-ok(( $pg1->principal_object->has_right( right => 'ShowConfigTab',
+ok(( $pg1->principal->has_right( right => 'ShowConfigTab',
object => RT->system ) and
- $pg2->principal_object->has_right( right => 'ShowConfigTab',
+ $pg2->principal->has_right( right => 'ShowConfigTab',
object => RT->system )),
"Test personal groups have ShowConfigTab right after delegation" );
( $ret, $msg ) = $g1->delete_member( $u1->principal_id );
ok( $ret, "Delete test user 1 from g1: $msg" );
-ok( not( $pg1->principal_object->has_right( right => 'ShowConfigTab',
+ok( not( $pg1->principal->has_right( right => 'ShowConfigTab',
object => RT->system )),
"Test personal group 1 lacks ShowConfigTab after user removed from g1" );
-ok( not( $pg2->principal_object->has_right( right => 'ShowConfigTab',
+ok( not( $pg2->principal->has_right( right => 'ShowConfigTab',
object => RT->system )),
"Test personal group 2 lacks ShowConfigTab after user removed from g1" );
@@ -88,19 +88,19 @@
( $ret, $msg ) = $ace->delegate( principal_id => $pg2->principal_id );
ok( $ret, "Delegate ShowConfigTab to pg2: $msg" );
-ok(( $pg1->principal_object->has_right( right => 'ShowConfigTab',
+ok(( $pg1->principal->has_right( right => 'ShowConfigTab',
object => RT->system ) and
- $pg2->principal_object->has_right( right => 'ShowConfigTab',
+ $pg2->principal->has_right( right => 'ShowConfigTab',
object => RT->system )),
"Test personal groups have ShowConfigTab right after delegation" );
-( $ret, $msg ) = $g1->principal_object->revoke_right( right => 'ShowConfigTab' );
+( $ret, $msg ) = $g1->principal->revoke_right( right => 'ShowConfigTab' );
ok( $ret, "Revoke ShowConfigTab from g1: $msg" );
-ok( not( $pg1->principal_object->has_right( right => 'ShowConfigTab',
+ok( not( $pg1->principal->has_right( right => 'ShowConfigTab',
object => RT->system )),
"Test personal group 1 lacks ShowConfigTab after user removed from g1" );
-ok( not( $pg2->principal_object->has_right( right => 'ShowConfigTab',
+ok( not( $pg2->principal->has_right( right => 'ShowConfigTab',
object => RT->system )),
"Test personal group 2 lacks ShowConfigTab after user removed from g1" );
@@ -112,8 +112,8 @@
# Revoke all rights granted to our cast
my $acl = RT::Model::ACECollection->new(current_user => RT->system_user);
foreach (@principals) {
- $acl->limit_to_principal(type => $$_->principal_object->type,
- id => $$_->principal_object->id);
+ $acl->limit_to_principal(type => $$_->principal->type,
+ id => $$_->principal->id);
}
while (my $ace = $acl->next()) {
$ace->delete();
Modified: rt/branches/3.999-DANGEROUS/t/mail/gateway.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/gateway.t (original)
+++ rt/branches/3.999-DANGEROUS/t/mail/gateway.t Thu Sep 4 23:45:31 2008
@@ -114,7 +114,7 @@
ok ($everyone_group->id, "Found group 'everyone'");
foreach( qw(CreateTicket ReplyToTicket CommentOnTicket) ) {
- $everyone_group->principal_object->revoke_right(right => $_);
+ $everyone_group->principal->revoke_right(right => $_);
}
}
@@ -255,7 +255,7 @@
diag "grant everybody with CreateTicket right" if $ENV{'TEST_VERBOSE'};
{
ok( RT::Test->set_rights(
- { principal => $everyone_group->principal_object,
+ { principal => $everyone_group->principal,
right => [qw(CreateTicket)],
},
), "Granted everybody the right to create tickets");
@@ -310,7 +310,7 @@
diag "grant everyone 'ReplyToTicket' right" if $ENV{'TEST_VERBOSE'};
{
ok( RT::Test->set_rights(
- { principal => $everyone_group->principal_object,
+ { principal => $everyone_group->principal,
right => [qw(CreateTicket ReplyToTicket)],
},
), "Granted everybody the right to reply to tickets" );
@@ -390,7 +390,7 @@
diag "grant everyone 'CommentOnTicket' right" if $ENV{'TEST_VERBOSE'};
{
ok( RT::Test->set_rights(
- { principal => $everyone_group->principal_object,
+ { principal => $everyone_group->principal,
right => [qw(CreateTicket ReplyToTicket CommentOnTicket)],
},
), "Granted everybody the right to comment on tickets");
@@ -606,7 +606,7 @@
}
-my ($val,$msg) = $everyone_group->principal_object->revoke_right(right => 'CreateTicket');
+my ($val,$msg) = $everyone_group->principal->revoke_right(right => 'CreateTicket');
ok ($val, $msg);
SKIP: {
@@ -723,7 +723,7 @@
cmp_ok( $tick->owner, '!=', $user->id, "we didn't change owner" );
-($status, $msg) = $user->principal_object->grant_right( object => $queue, right => 'ReplyToTicket' );
+($status, $msg) = $user->principal->grant_right( object => $queue, right => 'ReplyToTicket' );
ok( $status, "successfuly granted right: $msg" );
my $ace_id = $status;
ok( $user->has_right( right => 'ReplyToTicket', object => $tick ), "User can reply to ticket" );
@@ -776,12 +776,12 @@
my $group = RT::Model::Group->new(current_user => RT->system_user );
ok( $group->load_queue_role_group( queue => $qid, type=> 'Owner' ), "load queue owners role group" );
$ace = RT::Model::ACE->new(current_user => RT->system_user );
-($ace_id, $msg) = $group->principal_object->grant_right( right => 'ReplyToTicket', object => $queue );
+($ace_id, $msg) = $group->principal->grant_right( right => 'ReplyToTicket', object => $queue );
ok( $ace_id, "Granted queue owners role group with ReplyToTicket right" );
-($status, $msg) = $user->principal_object->grant_right( object => $queue, right => 'OwnTicket' );
+($status, $msg) = $user->principal->grant_right( object => $queue, right => 'OwnTicket' );
ok( $status, "successfuly granted right: $msg" );
-($status, $msg) = $user->principal_object->grant_right( object => $queue, right => 'TakeTicket' );
+($status, $msg) = $user->principal->grant_right( object => $queue, right => 'TakeTicket' );
ok( $status, "successfuly granted right: $msg" );
$! = 0;
Modified: rt/branches/3.999-DANGEROUS/t/mail/gnupg-realmail.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/gnupg-realmail.t (original)
+++ rt/branches/3.999-DANGEROUS/t/mail/gnupg-realmail.t Thu Sep 4 23:45:31 2008
@@ -50,7 +50,7 @@
}
RT::Test->set_rights(
- principal => $everyone->principal_object,
+ principal => $everyone->principal,
right => ['CreateTicket'],
);
Modified: rt/branches/3.999-DANGEROUS/t/mail/sendmail.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/sendmail.t (original)
+++ rt/branches/3.999-DANGEROUS/t/mail/sendmail.t Thu Sep 4 23:45:31 2008
@@ -16,7 +16,7 @@
#Were not testing acls here.
my $everyone = RT::Model::Group->new(current_user => RT->system_user);
$everyone->load_system_internal_group('Everyone');
-$everyone->principal_object->grant_right( right =>'SuperUser' );
+$everyone->principal->grant_right( right =>'SuperUser' );
is (__PACKAGE__, 'main', "We're operating in the main package");
@@ -538,5 +538,5 @@
# Don't taint the environment
-$everyone->principal_object->revoke_right(right =>'SuperUser');
+$everyone->principal->revoke_right(right =>'SuperUser');
1;
Modified: rt/branches/3.999-DANGEROUS/t/maildigest/attributes.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/maildigest/attributes.t (original)
+++ rt/branches/3.999-DANGEROUS/t/maildigest/attributes.t Thu Sep 4 23:45:31 2008
@@ -52,26 +52,26 @@
( $ret, $msg ) = $everyone->load_system_internal_group( 'Everyone' );
ok( $ret, "Loaded 'everyone' group: $msg" );
-( $ret, $msg ) = $everyone->principal_object->grant_right( right => 'CreateTicket',
+( $ret, $msg ) = $everyone->principal->grant_right( right => 'CreateTicket',
object => $testq );
ok( $ret || $msg =~ /already has/, "Granted everyone CreateTicket on testq: $msg" );
# Make user_d an admincc for the queue.
-( $ret, $msg ) = $user_d->principal_object->grant_right( right => 'AdminQueue',
+( $ret, $msg ) = $user_d->principal->grant_right( right => 'AdminQueue',
object => $testq );
ok( $ret || $msg =~ /already has/, "Granted dduser AdminQueue on testq: $msg" );
( $ret, $msg ) = $testq->add_watcher( type => 'admin_cc',
- principal_id => $user_d->principal_object->id );
+ principal_id => $user_d->principal->id );
ok( $ret || $msg =~ /already/, "dduser added as a queue watcher: $msg" );
# Give the others queue rights.
-( $ret, $msg ) = $user_n->principal_object->grant_right( right => 'AdminQueue',
+( $ret, $msg ) = $user_n->principal->grant_right( right => 'AdminQueue',
object => $testq );
ok( $ret || $msg =~ /already has/, "Granted emailnormal right on testq: $msg" );
-( $ret, $msg ) = $user_w->principal_object->grant_right( right => 'AdminQueue',
+( $ret, $msg ) = $user_w->principal->grant_right( right => 'AdminQueue',
object => $testq );
ok( $ret || $msg =~ /already has/, "Granted emailweekly right on testq: $msg" );
-( $ret, $msg ) = $user_s->principal_object->grant_right( right => 'AdminQueue',
+( $ret, $msg ) = $user_s->principal->grant_right( right => 'AdminQueue',
object => $testq );
ok( $ret || $msg =~ /already has/, "Granted emailsusp right on testq: $msg" );
@@ -86,10 +86,10 @@
# Make the other users ticket watchers.
( $ret, $msg ) = $ticket->add_watcher( type => 'cc',
- principal_id => $user_n->principal_object->id );
+ principal_id => $user_n->principal->id );
ok( $ret, "Added user_w as a ticket watcher: $msg" );
( $ret, $msg ) = $ticket->add_watcher( type => 'cc',
- principal_id => $user_s->principal_object->id );
+ principal_id => $user_s->principal->id );
ok( $ret, "Added user_s as a ticket watcher: $msg" );
my $obj;
Modified: rt/branches/3.999-DANGEROUS/t/savedsearch.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/savedsearch.t (original)
+++ rt/branches/3.999-DANGEROUS/t/savedsearch.t Thu Sep 4 23:45:31 2008
@@ -18,16 +18,16 @@
email => "searchuser\@p$$.example.com",
real_name => 'Search user');
ok($ret, "Created searchuser: $msg");
-$searchuser->principal_object->grant_right(right => 'LoadSavedSearch');
-$searchuser->principal_object->grant_right(right => 'CreateSavedSearch');
-$searchuser->principal_object->grant_right(right => 'ModifySelf');
+$searchuser->principal->grant_right(right => 'LoadSavedSearch');
+$searchuser->principal->grant_right(right => 'CreateSavedSearch');
+$searchuser->principal->grant_right(right => 'ModifySelf');
# This is the group whose searches searchuser should be able to see.
my $ingroup = RT::Model::Group->new(current_user => RT->system_user);
$ingroup->create_user_defined_group(name => 'searchgroup1'.$$);
$ingroup->add_member($searchuser->id);
-$searchuser->principal_object->grant_right(right => 'EditSavedSearches', object => $ingroup);
-$searchuser->principal_object->grant_right(right => 'ShowSavedSearches', object => $ingroup);
+$searchuser->principal->grant_right(right => 'EditSavedSearches', object => $ingroup);
+$searchuser->principal->grant_right(right => 'ShowSavedSearches', object => $ingroup);
# This is the group whose searches searchuser should not be able to see.
my $outgroup = RT::Model::Group->new(current_user => RT->system_user);
@@ -36,9 +36,9 @@
my $queue = RT::Model::Queue->new(current_user => RT->system_user);
$queue->create(name => 'SearchQueue'.$$);
-$searchuser->principal_object->grant_right(right => 'SeeQueue', object => $queue);
-$searchuser->principal_object->grant_right(right => 'ShowTicket', object => $queue);
-$searchuser->principal_object->grant_right(right => 'OwnTicket', object => $queue);
+$searchuser->principal->grant_right(right => 'SeeQueue', object => $queue);
+$searchuser->principal->grant_right(right => 'ShowTicket', object => $queue);
+$searchuser->principal->grant_right(right => 'OwnTicket', object => $queue);
my $ticket = RT::Model::Ticket->new(current_user => RT->system_user);
Modified: rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/02group_member.t Thu Sep 4 23:45:31 2008
@@ -75,7 +75,7 @@
$queue->load('General');
ok( $queue->id, "queue loaded succesfully" );
- $user->principal_object->grant_right( right => 'OwnTicket', object => $queue );
+ $user->principal->grant_right( right => 'OwnTicket', object => $queue );
use RT::Model::TicketCollection;
my $ticket = RT::Model::Ticket->new(current_user => RT->system_user );
Modified: rt/branches/3.999-DANGEROUS/t/shredder/02queue.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/shredder/02queue.t (original)
+++ rt/branches/3.999-DANGEROUS/t/shredder/02queue.t Thu Sep 4 23:45:31 2008
@@ -83,7 +83,7 @@
$group->load_system_internal_group('Everyone');
ok($group->id, 'loaded group');
- ($id, $msg) = $group->principal_object->grant_right(
+ ($id, $msg) = $group->principal->grant_right(
right => 'CreateTicket',
object => $queue,
);
Modified: rt/branches/3.999-DANGEROUS/t/ticket/action_linear_escalate.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/action_linear_escalate.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/action_linear_escalate.t Thu Sep 4 23:45:31 2008
@@ -26,7 +26,7 @@
ok $gecos && $gecos->id, 'loaded or created gecos user';
# get rid of all right permissions
-$gecos->principal_object->grant_right( right => 'SuperUser' );
+$gecos->principal->grant_right( right => 'SuperUser' );
my $user = RT::Test->load_or_create_user(
@@ -34,7 +34,7 @@
);
ok $user && $user->id, 'loaded or created user';
-$user->principal_object->grant_right( right => 'SuperUser' );
+$user->principal->grant_right( right => 'SuperUser' );
my $current_user = RT::CurrentUser->new( id => $user->id );
is( $user->id, $current_user->id, "Got current user?" );
Modified: rt/branches/3.999-DANGEROUS/t/ticket/add-watchers.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/add-watchers.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/add-watchers.t Thu Sep 4 23:45:31 2008
@@ -83,7 +83,7 @@
my $cu= RT::CurrentUser->new( id => $user->id );
# make sure user can see tickets in the queue
-my $principal = $user->principal_object;
+my $principal = $user->principal;
ok( $principal, "principal loaded" );
$principal->grant_right( right => 'ShowTicket', object => $queue );
$principal->grant_right( right => 'SeeQueue' , object => $queue );
Modified: rt/branches/3.999-DANGEROUS/t/ticket/deferred_owner.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/deferred_owner.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/deferred_owner.t Thu Sep 4 23:45:31 2008
@@ -23,10 +23,10 @@
diag "check that deffering owner doesn't regress" if $ENV{'TEST_VERBOSE'};
{
RT::Test->set_rights(
- { principal => $tester->principal_object,
+ { principal => $tester->principal,
right => [qw(Seequeue ShowTicket CreateTicket OwnTicket)],
},
- { principal => $owner_role_group->principal_object,
+ { principal => $owner_role_group->principal,
object => $queue,
right => [qw(ModifyTicket)],
},
@@ -49,7 +49,7 @@
if $ENV{'TEST_VERBOSE'};
{
RT::Test->set_rights(
- { principal => $tester->principal_object,
+ { principal => $tester->principal,
right => [qw(Seequeue ShowTicket CreateTicket OwnTicket)],
},
);
@@ -70,10 +70,10 @@
diag "check that deffering owner really works" if $ENV{'TEST_VERBOSE'};
{
RT::Test->set_rights(
- { principal => $tester->principal_object,
+ { principal => $tester->principal,
right => [qw(Seequeue ShowTicket CreateTicket)],
},
- { principal => $queue->role_group('cc')->principal_object,
+ { principal => $queue->role_group('cc')->principal,
object => $queue,
right => [qw(OwnTicket TakeTicket)],
},
@@ -94,7 +94,7 @@
diag "check that deffering doesn't work without correct rights" if $ENV{'TEST_VERBOSE'};
{
RT::Test->set_rights(
- { principal => $tester->principal_object,
+ { principal => $tester->principal,
right => [qw(Seequeue ShowTicket CreateTicket)],
},
);
Modified: rt/branches/3.999-DANGEROUS/t/ticket/linking.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/linking.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/linking.t Thu Sep 4 23:45:31 2008
@@ -89,11 +89,11 @@
ok ($id,$msg);
# grant ShowTicket right to allow count transactions
-($id,$msg) = $u1->principal_object->grant_right ( object => $q1, right => 'ShowTicket');
+($id,$msg) = $u1->principal->grant_right ( object => $q1, right => 'ShowTicket');
ok ($id,$msg);
-($id,$msg) = $u1->principal_object->grant_right ( object => $q2, right => 'ShowTicket');
+($id,$msg) = $u1->principal->grant_right ( object => $q2, right => 'ShowTicket');
ok ($id,$msg);
-($id,$msg) = $u1->principal_object->grant_right ( object => $q1, right => 'CreateTicket');
+($id,$msg) = $u1->principal->grant_right ( object => $q1, right => 'CreateTicket');
ok ($id,$msg);
my $creator = RT::CurrentUser->new(id => $u1->id);
@@ -130,7 +130,7 @@
RT->config->set( StrictLinkACL => 1 );
}
-($id,$msg) = $u1->principal_object->grant_right ( object => $q1, right => 'ModifyTicket');
+($id,$msg) = $u1->principal->grant_right ( object => $q1, right => 'ModifyTicket');
ok ($id,$msg);
diag('try to add link without rights') if $ENV{'TEST_VERBOSE'};
@@ -209,9 +209,9 @@
ok(!$id,$msg);
is(link_count($filename), 0, "scrips ok");
-($id,$msg) = $u1->principal_object->grant_right ( object => $q2, right => 'CreateTicket');
+($id,$msg) = $u1->principal->grant_right ( object => $q2, right => 'CreateTicket');
ok ($id,$msg);
-($id,$msg) = $u1->principal_object->grant_right ( object => $q2, right => 'ModifyTicket');
+($id,$msg) = $u1->principal->grant_right ( object => $q2, right => 'ModifyTicket');
ok ($id,$msg);
($id,$msg) = $ticket->add_link(type => 'RefersTo', target => $ticket2->id);
ok($id,$msg);
Modified: rt/branches/3.999-DANGEROUS/t/ticket/pawsort.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/pawsort.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/pawsort.t Thu Sep 4 23:45:31 2008
@@ -31,14 +31,14 @@
my $me = RT::Model::User->new(current_user => RT->system_user);
($ret, $msg) = $me->create(name => "Me$$", email => $$.'create-me-1 at example.com');
-($ret, $msg) = $me->principal_object->grant_right(object =>$queue_obj, right => 'OwnTicket');
-($ret, $msg) = $me->principal_object->grant_right(object =>$queue_obj, right => 'SeeQueue');
-($ret, $msg) = $me->principal_object->grant_right(object =>$queue_obj, right => 'ShowTicket');
+($ret, $msg) = $me->principal->grant_right(object =>$queue_obj, right => 'OwnTicket');
+($ret, $msg) = $me->principal->grant_right(object =>$queue_obj, right => 'SeeQueue');
+($ret, $msg) = $me->principal->grant_right(object =>$queue_obj, right => 'ShowTicket');
my $you = RT::Model::User->new(current_user => RT->system_user);
($ret, $msg) = $you->create(name => "You$$", email => $$.'create-you-1 at example.com');
-($ret, $msg) = $you->principal_object->grant_right(object =>$queue_obj, right => 'OwnTicket');
-($ret, $msg) = $you->principal_object->grant_right(object =>$queue_obj, right => 'SeeQueue');
-($ret, $msg) = $you->principal_object->grant_right(object =>$queue_obj, right => 'ShowTicket');
+($ret, $msg) = $you->principal->grant_right(object =>$queue_obj, right => 'OwnTicket');
+($ret, $msg) = $you->principal->grant_right(object =>$queue_obj, right => 'SeeQueue');
+($ret, $msg) = $you->principal->grant_right(object =>$queue_obj, right => 'ShowTicket');
my $nobody = RT::Model::User->new(current_user => RT->system_user);
$nobody->load('nobody');
Modified: rt/branches/3.999-DANGEROUS/t/ticket/search_by_watcher.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/search_by_watcher.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/search_by_watcher.t Thu Sep 4 23:45:31 2008
@@ -250,7 +250,7 @@
my $everyone = RT::Model::Group->new(current_user => RT->system_user );
$everyone->load_system_internal_group('Everyone');
ok($everyone->id, "loaded 'everyone' group");
- my($id, $msg) = $everyone->principal_object->grant_right( right => 'OwnTicket',
+ my($id, $msg) = $everyone->principal->grant_right( right => 'OwnTicket',
object => $q
);
ok($id, "granted OwnTicket right to Everyone on '$queue'") or diag("error: $msg");
Modified: rt/branches/3.999-DANGEROUS/t/ticket/sort-by-user.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/ticket/sort-by-user.t (original)
+++ rt/branches/3.999-DANGEROUS/t/ticket/sort-by-user.t Thu Sep 4 23:45:31 2008
@@ -39,9 +39,9 @@
);
ok $uid, "created user #$uid";
- my ($status, $msg) = $user->principal_object->grant_right( right => 'OwnTicket', object => $queue );
+ my ($status, $msg) = $user->principal->grant_right( right => 'OwnTicket', object => $queue );
ok $status, "granted right";
- ($status, $msg) = $user->principal_object->grant_right( right => 'CreateTicket', object => $queue );
+ ($status, $msg) = $user->principal->grant_right( right => 'CreateTicket', object => $queue );
ok $status, "granted right";
push @users, $user;
Modified: rt/branches/3.999-DANGEROUS/t/web/cf_access.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/cf_access.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/cf_access.t Thu Sep 4 23:45:31 2008
@@ -59,7 +59,7 @@
my $tester = RT::Test->load_or_create_user( name => 'tester', password => '123456' );
RT::Test->set_rights(
- { principal => $tester->principal_object,
+ { principal => $tester->principal,
right => [qw(SeeQueue ShowTicket CreateTicket)],
},
);
@@ -91,7 +91,7 @@
}
RT::Test->set_rights(
- { principal => $tester->principal_object,
+ { principal => $tester->principal,
right => [qw(SeeQueue ShowTicket CreateTicket SeeCustomField)],
},
);
@@ -125,7 +125,7 @@
}
RT::Test->set_rights(
- { principal => $tester->principal_object,
+ { principal => $tester->principal,
right => [qw(SeeQueue ShowTicket CreateTicket SeeCustomField ModifyCustomField)],
},
);
Modified: rt/branches/3.999-DANGEROUS/t/web/command_line.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/command_line.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/command_line.t Thu Sep 4 23:45:31 2008
@@ -359,13 +359,13 @@
ok($steal_queue_id, "Got the queue? $msg");
ok($steal_queue->id, "queue obj has id");
my $status;
- ($status, $msg) = $steal_user->principal_object->grant_right( right => 'ShowTicket', object => $steal_queue );
+ ($status, $msg) = $steal_user->principal->grant_right( right => 'ShowTicket', object => $steal_queue );
ok($status, "Gave 'ShowTicket' to our user? $msg");
- ($status, $msg) = $steal_user->principal_object->grant_right( right => 'OwnTicket', object => $steal_queue );
+ ($status, $msg) = $steal_user->principal->grant_right( right => 'OwnTicket', object => $steal_queue );
ok($status, "Gave 'OwnTicket' to our user? $msg");
- ($status, $msg) = $steal_user->principal_object->grant_right( right => 'StealTicket', object => $steal_queue );
+ ($status, $msg) = $steal_user->principal->grant_right( right => 'StealTicket', object => $steal_queue );
ok($status, "Gave 'StealTicket' to our user? $msg");
- ($status, $msg) = $steal_user->principal_object->grant_right( right => 'TakeTicket', object => $steal_queue );
+ ($status, $msg) = $steal_user->principal->grant_right( right => 'TakeTicket', object => $steal_queue );
ok($status, "Gave 'TakeTicket' to our user? $msg");
# create a ticket to take/steal
Modified: rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/crypt-gnupg.t Thu Sep 4 23:45:31 2008
@@ -360,8 +360,8 @@
# now test the owner_nameKey and RequestorsKey fields
my $nokey = RT::Test->load_or_create_user(name => 'nokey', email => 'nokey at example.com');
-$nokey->principal_object->grant_right(right => 'CreateTicket');
-$nokey->principal_object->grant_right(right => 'OwnTicket');
+$nokey->principal->grant_right(right => 'CreateTicket');
+$nokey->principal->grant_right(right => 'OwnTicket');
my $tick = RT::Model::Ticket->new(current_user => RT->system_user );
$tick->create(subject => 'owner lacks pubkey', queue => 'general',
Modified: rt/branches/3.999-DANGEROUS/t/web/custom_frontpage.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/custom_frontpage.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/custom_frontpage.t Thu Sep 4 23:45:31 2008
@@ -13,10 +13,10 @@
$user_object->set_name('customer');
$user_object->set_privileged(1);
($ret, $msg) = $user_object->set_password('customer');
-$user_object->principal_object->grant_right(right => 'LoadSavedSearch');
-$user_object->principal_object->grant_right(right => 'EditSavedSearch');
-$user_object->principal_object->grant_right(right => 'CreateSavedSearch');
-$user_object->principal_object->grant_right(right => 'ModifySelf');
+$user_object->principal->grant_right(right => 'LoadSavedSearch');
+$user_object->principal->grant_right(right => 'EditSavedSearch');
+$user_object->principal->grant_right(right => 'CreateSavedSearch');
+$user_object->principal->grant_right(right => 'ModifySelf');
ok $m->login( 'customer' => 'customer' ), "logged in";
Modified: rt/branches/3.999-DANGEROUS/t/web/dashboards-groups.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/dashboards-groups.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/dashboards-groups.t Thu Sep 4 23:45:31 2008
@@ -15,18 +15,18 @@
$user_obj->set_name('customer');
$user_obj->set_privileged(1);
($ok, $msg) = $user_obj->set_password('customer');
-$user_obj->principal_object->grant_right(right => 'ModifySelf');
+$user_obj->principal->grant_right(right => 'ModifySelf');
my $currentuser = RT::CurrentUser->new( id => $user_obj->id );
my $queue = RT::Model::Queue->new(current_user => RT->system_user);
$queue->create(name => 'SearchQueue'.$$);
-$user_obj->principal_object->grant_right(right => $_, object => $queue)
+$user_obj->principal->grant_right(right => $_, object => $queue)
for qw/SeeQueue ShowTicket OwnTicket/;
# grant the user all these rights so we can make sure that the group rights
# are checked and not these as well
-$user_obj->principal_object->grant_right(right => $_, object => RT->system )
+$user_obj->principal->grant_right(right => $_, object => RT->system )
for qw/SubscribeDashboard CreateOwnDashboard SeeOwnDashboard ModifyOwnDashboard DeleteOwnDashboard/;
# }}}
@@ -65,7 +65,7 @@
is_deeply([$m->current_form->find_input('privacy')->possible_values], ["RT::Model::User-" . $user_obj->id], "the only selectable privacy is user");
$m->content_lacks('Delete', "Delete button hidden because we are creating");
-$user_obj->principal_object->grant_right(right => 'CreateGroupDashboard', object => $inner_group);
+$user_obj->principal->grant_right(right => 'CreateGroupDashboard', object => $inner_group);
$m->follow_link_ok({text => "New dashboard"});
$m->form_name( 'modify_dashboard' );
@@ -93,7 +93,7 @@
$m->content_lacks("inner dashboard", "no SeeGroupDashboard right");
$m->content_contains("Permission denied");
-$user_obj->principal_object->grant_right(right => 'SeeGroupDashboard', object => $inner_group);
+$user_obj->principal->grant_right(right => 'SeeGroupDashboard', object => $inner_group);
$m->get_ok("/Dashboards/Modify.html?id=$id");
$m->content_contains("inner dashboard", "we now have SeeGroupDashboard right");
$m->content_lacks("Permission denied");
Modified: rt/branches/3.999-DANGEROUS/t/web/dashboards.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/dashboards.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/dashboards.t Thu Sep 4 23:45:31 2008
@@ -14,14 +14,14 @@
$user_obj->set_name('customer');
$user_obj->set_privileged(1);
($ret, $msg) = $user_obj->set_password('customer');
-$user_obj->principal_object->grant_right(right => 'ModifySelf');
+$user_obj->principal->grant_right(right => 'ModifySelf');
my $currentuser = RT::CurrentUser->new( id => $user_obj->id );
my $queue = RT::Model::Queue->new(current_user => RT->system_user);
$queue->create(name => 'SearchQueue'.$$);
-$user_obj->principal_object->grant_right(right => 'SeeQueue', object => $queue);
-$user_obj->principal_object->grant_right(right => 'ShowTicket', object => $queue);
-$user_obj->principal_object->grant_right(right => 'OwnTicket', object => $queue);
+$user_obj->principal->grant_right(right => 'SeeQueue', object => $queue);
+$user_obj->principal->grant_right(right => 'ShowTicket', object => $queue);
+$user_obj->principal->grant_right(right => 'OwnTicket', object => $queue);
ok $m->login(customer => 'customer'), "logged in";
@@ -32,7 +32,7 @@
$m->content_contains("Permission denied");
$m->content_lacks("Save Changes");
-$user_obj->principal_object->grant_right(
+$user_obj->principal->grant_right(
right => 'ModifyOwnDashboard',
object => RT->system
);
@@ -42,7 +42,7 @@
$m->content_contains("Permission denied");
$m->content_lacks("Save Changes");
-$user_obj->principal_object->grant_right(
+$user_obj->principal->grant_right(
right => 'CreateOwnDashboard',
object => RT->system
);
@@ -66,7 +66,7 @@
$m->get_ok($url."Dashboards/index.html");
$m->content_lacks("different dashboard", "we lack SeeOwnDashboard");
-$user_obj->principal_object->grant_right(right => 'SeeOwnDashboard', object => RT->system );
+$user_obj->principal->grant_right(right => 'SeeOwnDashboard', object => RT->system );
$m->get_ok($url."Dashboards/index.html");
$m->content_contains("different dashboard", "we now have SeeOwnDashboard");
@@ -143,7 +143,7 @@
Jifty::DBI::Record::Cachable->flush_cache;
is($user_obj->attributes->named('Subscription'), 0, "no subscriptions");
-$user_obj->principal_object->grant_right(right => 'SubscribeDashboard', object => RT->system );
+$user_obj->principal->grant_right(right => 'SubscribeDashboard', object => RT->system );
$m->get_ok("/Dashboards/Modify.html?id=$id");
$m->follow_link_ok({text => "Subscription"});
@@ -170,7 +170,7 @@
$m->get_ok("/Dashboards/Modify.html?id=$id&delete=1");
$m->content_contains("Permission denied", "unable to delete dashboard because we lack DeleteOwnDashboard");
-$user_obj->principal_object->grant_right(right => 'DeleteOwnDashboard', object => RT->system );
+$user_obj->principal->grant_right(right => 'DeleteOwnDashboard', object => RT->system );
$m->get_ok("/Dashboards/Modify.html?id=$id");
$m->content_contains('Delete', "Delete button shows because we have DeleteOwnDashboard");
Modified: rt/branches/3.999-DANGEROUS/t/web/rights.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/rights.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/rights.t Thu Sep 4 23:45:31 2008
@@ -50,7 +50,7 @@
$m->content_contains('right Granted', 'got message');
RT::Model::Principal::invalidate_acl_cache();
- ok($everyone->principal_object->has_right( right => 'SuperUser', object => RT->system ), 'group has right');
+ ok($everyone->principal->has_right( right => 'SuperUser', object => RT->system ), 'group has right');
is_deeply( [get_rights( $m, $everyone_gid, 'RT::System-1' )], ['SuperUser'], 'granted SuperUser right' );
}
@@ -62,7 +62,7 @@
$m->content_contains('Right revoked', 'got message');
RT::Model::Principal::invalidate_acl_cache();
- ok(!$everyone->principal_object->has_right( right => 'SuperUser', object => RT->system ), 'group has no right');
+ ok(!$everyone->principal->has_right( right => 'SuperUser', object => RT->system ), 'group has no right');
is_deeply( [get_rights( $m, $everyone_gid, 'RT::System-1' )], [], 'revoked SuperUser right' );
}
Modified: rt/branches/3.999-DANGEROUS/t/web/rights1.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/rights1.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/rights1.t Thu Sep 4 23:45:31 2008
@@ -38,7 +38,7 @@
# Now test for their presence, one at a time. Sleep for a bit after
# ACL changes, thanks to the 10s ACL cache.
-my ($grantid,$grantmsg) =$user_obj->principal_object->grant_right(right => 'ShowConfigTab', object => RT->system);
+my ($grantid,$grantmsg) =$user_obj->principal->grant_right(right => 'ShowConfigTab', object => RT->system);
ok($grantid,$grantmsg);
@@ -47,15 +47,15 @@
like($agent->{'content'} , qr/Logout/i, "Reloaded page successfully");
ok($agent->find_link( url => "$RT::WebPath/Admin/",
text => 'Configuration'), "Found config tab" );
-my ($revokeid,$revokemsg) =$user_obj->principal_object->revoke_right(right => 'ShowConfigTab');
+my ($revokeid,$revokemsg) =$user_obj->principal->revoke_right(right => 'ShowConfigTab');
ok ($revokeid,$revokemsg);
-($grantid,$grantmsg) =$user_obj->principal_object->grant_right(right => 'ModifySelf');
+($grantid,$grantmsg) =$user_obj->principal->grant_right(right => 'ModifySelf');
ok ($grantid,$grantmsg);
$agent->reload();
like($agent->{'content'} , qr/Logout/i, "Reloaded page successfully");
ok($agent->find_link(
text => 'Preferences'), "Found prefs pane" );
-($revokeid,$revokemsg) = $user_obj->principal_object->revoke_right(right => 'ModifySelf');
+($revokeid,$revokemsg) = $user_obj->principal->revoke_right(right => 'ModifySelf');
ok ($revokeid,$revokemsg);
# Good. Now load the search page and test Load/Save Search.
$agent->follow_link( url => "$RT::WebPath/Search/Build.html",
@@ -64,14 +64,14 @@
ok($agent->{'content'} !~ /Load saved search/i, "No search loading box");
ok($agent->{'content'} !~ /Saved searches/i, "No saved searches box");
-($grantid,$grantmsg) = $user_obj->principal_object->grant_right(right => 'LoadSavedSearch');
+($grantid,$grantmsg) = $user_obj->principal->grant_right(right => 'LoadSavedSearch');
ok($grantid,$grantmsg);
$agent->reload();
like($agent->{'content'} , qr/Load saved search/i, "Search loading box exists");
ok($agent->{'content'} !~ /input\s+type=['"]submit['"][^>]+name=['"]saved_search_save['"]/i,
"Still no saved searches box");
-($grantid,$grantmsg) =$user_obj->principal_object->grant_right(right => 'CreateSavedSearch');
+($grantid,$grantmsg) =$user_obj->principal->grant_right(right => 'CreateSavedSearch');
ok ($grantid,$grantmsg);
$agent->reload();
like($agent->{'content'} , qr/Load saved search/i,
@@ -92,13 +92,13 @@
ok($ret, "SelectOwner test group creation. $msg");
# Add our customer to the customer group, and give it queue rights.
-($ret, $msg) = $group_obj->add_member($user_obj->principal_object->id());
+($ret, $msg) = $group_obj->add_member($user_obj->principal->id());
ok($ret, "Added customer to its group. $msg");
-($grantid,$grantmsg) =$group_obj->principal_object->grant_right(right => 'OwnTicket',
+($grantid,$grantmsg) =$group_obj->principal->grant_right(right => 'OwnTicket',
object => $queue_obj);
ok($grantid,$grantmsg);
-($grantid,$grantmsg) =$group_obj->principal_object->grant_right(right => 'SeeQueue',
+($grantid,$grantmsg) =$group_obj->principal->grant_right(right => 'SeeQueue',
object => $queue_obj);
ok ($grantid,$grantmsg);
# Now. When we look at the search page we should be able to see
More information about the Rt-commit
mailing list