[Rt-commit] r18903 - in rt/3.999/trunk: . lib/RT lib/RT/Interface/Email/Auth lib/RT/Model lib/RT/Shredder 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/REST/1.0/Forms/group share/html/User/Groups t t/mail t/maildigest t/shredder t/ticket t/web
ruz at bestpractical.com
ruz at bestpractical.com
Sat Mar 21 00:07:56 EDT 2009
Author: ruz
Date: Sat Mar 21 00:07:56 2009
New Revision: 18903
Modified:
rt/3.999/trunk/TODO.schema_upgrade_script
rt/3.999/trunk/lib/RT/Bootstrap.pm
rt/3.999/trunk/lib/RT/HasRoleGroups.pm
rt/3.999/trunk/lib/RT/Interface/Email/Auth/MailFrom.pm
rt/3.999/trunk/lib/RT/Model/ACE.pm
rt/3.999/trunk/lib/RT/Model/ACECollection.pm
rt/3.999/trunk/lib/RT/Model/Group.pm
rt/3.999/trunk/lib/RT/Model/Queue.pm
rt/3.999/trunk/lib/RT/Model/Ticket.pm
rt/3.999/trunk/lib/RT/Model/User.pm
rt/3.999/trunk/lib/RT/Model/UserCollection.pm
rt/3.999/trunk/lib/RT/Shredder/User.pm
rt/3.999/trunk/lib/RT/Test.pm
rt/3.999/trunk/share/html/Admin/CustomFields/UserRights.html
rt/3.999/trunk/share/html/Admin/Elements/SelectRights
rt/3.999/trunk/share/html/Admin/Global/UserRights.html
rt/3.999/trunk/share/html/Admin/Groups/Modify.html
rt/3.999/trunk/share/html/Admin/Groups/UserRights.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/REST/1.0/Forms/group/default
rt/3.999/trunk/share/html/User/Groups/Modify.html
rt/3.999/trunk/t/api/cf_external.t
rt/3.999/trunk/t/api/group.t
rt/3.999/trunk/t/api/groups.t
rt/3.999/trunk/t/api/queue.t
rt/3.999/trunk/t/api/rights.t
rt/3.999/trunk/t/api/ticket.t
rt/3.999/trunk/t/api/user.t
rt/3.999/trunk/t/api/users.t
rt/3.999/trunk/t/mail/gateway.t
rt/3.999/trunk/t/mail/gnupg-realmail.t
rt/3.999/trunk/t/mail/gnupg-reverification.t
rt/3.999/trunk/t/mail/sendmail.t
rt/3.999/trunk/t/maildigest/attributes.t
rt/3.999/trunk/t/savedsearch.t
rt/3.999/trunk/t/shredder/02group_member.t
rt/3.999/trunk/t/shredder/02queue.t
rt/3.999/trunk/t/ticket/deferred_owner.t
rt/3.999/trunk/t/ticket/requestor-order.t
rt/3.999/trunk/t/ticket/search_by_watcher.t
rt/3.999/trunk/t/web/dashboards-groups.t
rt/3.999/trunk/t/web/rights.t
rt/3.999/trunk/t/web/rights1.t
Log:
* delete _group sufix on pile of load_* and create_* methods in group model
Modified: rt/3.999/trunk/TODO.schema_upgrade_script
==============================================================================
--- rt/3.999/trunk/TODO.schema_upgrade_script (original)
+++ rt/3.999/trunk/TODO.schema_upgrade_script Sat Mar 21 00:07:56 2009
@@ -15,3 +15,4 @@
Users.email_confirmed is new
zeroes in ACL.delegate_by and ACL.delegate_from should be replaced with NULLs
+* delegations are dropped, this is not required
Modified: rt/3.999/trunk/lib/RT/Bootstrap.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Bootstrap.pm (original)
+++ rt/3.999/trunk/lib/RT/Bootstrap.pm Sat Mar 21 00:07:56 2009
@@ -126,7 +126,7 @@
# system groups
foreach my $name (qw(Everyone Privileged Unprivileged)) {
my $group = RT::Model::Group->new( current_user => RT->system_user );
- $group->load_system_internal_group($name);
+ $group->load_system_internal($name);
if ( $group->id ) {
# push @warns, "System group '$name' already exists.";
@@ -182,7 +182,7 @@
# system role groups
foreach my $name (qw(owner requestor cc admin_cc)) {
my $group = RT::Model::Group->new( current_user => RT->system_user );
- my ( $val, $msg ) = $group->create_role_group( object => RT->system, type => $name);
+ my ( $val, $msg ) = $group->create_role( object => RT->system, type => $name);
return ( $val, $msg ) unless $val;
}
}
@@ -227,7 +227,7 @@
if ( ref $_ eq 'HASH' ) {
$parent->load_by_cols(%$_);
} elsif ( !ref $_ ) {
- $parent->load_user_defined_group($_);
+ $parent->load_user_defined($_);
} else {
print "(Error: wrong format of member_of field."
. " Should be name of user defined group or"
@@ -357,15 +357,15 @@
if ( $item->{'GroupDomain'} ) {
$princ = RT::Model::Group->new( current_user => RT->system_user );
if ( $item->{'GroupDomain'} eq 'UserDefined' ) {
- $princ->load_user_defined_group( $item->{'group_id'} );
+ $princ->load_user_defined( $item->{'group_id'} );
} elsif ( $item->{'GroupDomain'} eq 'SystemInternal' ) {
- $princ->load_system_internal_group( $item->{'GroupType'} );
+ $princ->load_system_internal( $item->{'GroupType'} );
} elsif ( $item->{'GroupDomain'} eq 'RT::System-Role' ) {
- $princ->create_role_group( object => RT->system, type => $item->{'GroupType'} );
+ $princ->create_role( object => RT->system, type => $item->{'GroupType'} );
} elsif ( $item->{'GroupDomain'} eq 'RT::Model::Queue-Role'
&& $item->{'queue'} )
{
- $princ->create_role_group(
+ $princ->create_role(
object => $object,
type => $item->{'GroupType'},
);
@@ -516,7 +516,7 @@
my $user = RT::Model::User->new( current_user => RT->system_user );
$user->load($username);
my $equiv_group = RT::Model::Group->new( current_user => RT->system_user );
- $equiv_group->load_acl_equivalence_group($user);
+ $equiv_group->load_acl_equivalence($user);
return ( $equiv_group->id );
}
Modified: rt/3.999/trunk/lib/RT/HasRoleGroups.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/HasRoleGroups.pm (original)
+++ rt/3.999/trunk/lib/RT/HasRoleGroups.pm Sat Mar 21 00:07:56 2009
@@ -40,7 +40,7 @@
# Load the relevant group.
my $group = RT::Model::Group->new( current_user => $self->current_user );
- $group->load_role_group(
+ $group->load_role(
object => $self,
type => $args{'type'},
);
@@ -150,7 +150,7 @@
}
my $group = RT::Model::Group->new( current_user => $self->current_user );
- $group->create_role_group(
+ $group->create_role(
object => $self,
type => $args{'type'},
);
@@ -261,7 +261,7 @@
# see if this user is already a watcher.
my $group = RT::Model::Group->new( current_user => $self->current_user );
- $group->load_role_group(
+ $group->load_role(
object => $self,
type => $args{'type'},
);
@@ -303,11 +303,11 @@
my $role = shift;
my $obj = RT::Model::Group->new( current_user => $self->current_user );
- $obj->load_role_group( object => $self, type => $role );
+ $obj->load_role( object => $self, type => $role );
return $obj;
}
-=head2 create_role_group
+=head2 create_role
Create role group for this object.
@@ -315,12 +315,12 @@
=cut
-sub create_role_group {
+sub create_role {
my $self = shift;
my $type = shift;
my $group = RT::Model::Group->new( current_user => $self->current_user );
- my ($id, $msg) = $group->create_role_group(
+ my ($id, $msg) = $group->create_role(
object => $self,
type => $type,
);
Modified: rt/3.999/trunk/lib/RT/Interface/Email/Auth/MailFrom.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Interface/Email/Auth/MailFrom.pm (original)
+++ rt/3.999/trunk/lib/RT/Interface/Email/Auth/MailFrom.pm Sat Mar 21 00:07:56 2009
@@ -79,14 +79,14 @@
# If the user can't be loaded, we may need to create one. Figure out the acl situation.
my $unpriv = RT::Model::Group->new( current_user => RT->system_user );
- $unpriv->load_system_internal_group('Unprivileged');
+ $unpriv->load_system_internal('Unprivileged');
unless ( $unpriv->id ) {
Jifty->log->fatal("Couldn't find the 'Unprivileged' internal group");
return ( $args{'CurrentUser'}, -1 );
}
my $everyone = RT::Model::Group->new( current_user => RT->system_user );
- $everyone->load_system_internal_group('Everyone');
+ $everyone->load_system_internal('Everyone');
unless ( $everyone->id ) {
Jifty->log->fatal("Couldn't find the 'Everyone' internal group");
return ( $args{'CurrentUser'}, -1 );
Modified: rt/3.999/trunk/lib/RT/Model/ACE.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/ACE.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/ACE.pm Sat Mar 21 00:07:56 2009
@@ -519,7 +519,7 @@
# ACL equivalence groups
if ( $princ_type eq 'User' ) {
my $equiv_group = RT::Model::Group->new( current_user => $self->current_user );
- $equiv_group->load_acl_equivalence_group($princ_obj);
+ $equiv_group->load_acl_equivalence($princ_obj);
unless ( $equiv_group->id ) {
Jifty->log->fatal( "No ACL equiv group for princ " . $princ_obj->id );
return ( RT::Model::Principal->new( current_user => RT->system_user ), undef );
Modified: rt/3.999/trunk/lib/RT/Model/ACECollection.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/ACECollection.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/ACECollection.pm Sat Mar 21 00:07:56 2009
@@ -199,7 +199,7 @@
$princ->load( $args{'id'} );
if ( $princ->type eq 'User' ) {
my $group = RT::Model::Group->new( current_user => RT->system_user );
- $group->load_acl_equivalence_group($princ);
+ $group->load_acl_equivalence($princ);
$args{'id'} = $group->principal_id;
}
$self->limit(
Modified: rt/3.999/trunk/lib/RT/Model/Group.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/Group.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/Group.pm Sat Mar 21 00:07:56 2009
@@ -185,7 +185,7 @@
-=head2 load_user_defined_group name
+=head2 load_user_defined name
Loads a system group from the database. The only argument is
the group's name.
@@ -193,7 +193,7 @@
=cut
-sub load_user_defined_group {
+sub load_user_defined {
my $self = shift;
my $identifier = shift;
@@ -212,7 +212,7 @@
-=head2 load_acl_equivalence_group PRINCIPAL
+=head2 load_acl_equivalence PRINCIPAL
Loads a user's acl equivalence group. Takes a principal object or its ID.
ACL equivalnce groups are used to simplify the acl system. Each user
@@ -223,7 +223,7 @@
=cut
-sub load_acl_equivalence_group {
+sub load_acl_equivalence {
my $self = shift;
my $principal = shift;
$principal = $principal->id if ref $principal;
@@ -237,13 +237,13 @@
-=head2 load_personal_group {name => name, User => USERID}
+=head2 load_personal {name => name, User => USERID}
Loads a personal group from the database.
=cut
-sub load_personal_group {
+sub load_personal {
my $self = shift;
my %args = (
name => undef,
@@ -260,7 +260,7 @@
}
-=head2 load_system_internal_group name
+=head2 load_system_internal name
Loads a Pseudo group from the database. The only argument is
the group's name.
@@ -268,7 +268,7 @@
=cut
-sub load_system_internal_group {
+sub load_system_internal {
my $self = shift;
my $identifier = shift;
@@ -279,7 +279,7 @@
}
-=head2 load_role_group { object => OBJ, domain => DOMAIN, type => TYPE, instance => ID }
+=head2 load_role { object => OBJ, domain => DOMAIN, type => TYPE, instance => ID }
Loads a role group of an object (ticket, queue, system or other) from the database.
Takes the following arguments:
@@ -299,7 +299,7 @@
=cut
-sub load_role_group {
+sub load_role {
my $self = shift;
my %args = (
domain => undef,
@@ -406,7 +406,7 @@
-=head2 create_user_defined_group { name => "name", description => "description"}
+=head2 create_user_defined { name => "name", description => "description"}
A helper subroutine which creates a system group
@@ -414,7 +414,7 @@
=cut
-sub create_user_defined_group {
+sub create_user_defined {
my $self = shift;
unless ( $self->current_user_has_right('AdminGroup') ) {
@@ -480,7 +480,7 @@
-=head2 create_personal_group { principal_id => PRINCIPAL_ID, name => "name", description => "description"}
+=head2 create_personal { principal_id => PRINCIPAL_ID, name => "name", description => "description"}
A helper subroutine which creates a personal group.
@@ -488,7 +488,7 @@
=cut
-sub create_personal_group {
+sub create_personal {
my $self = shift;
my %args = (
name => undef,
@@ -524,7 +524,7 @@
-=head2 create_role_group { object => OBJ, domain => DOMAIN, type => TYPE, instance => ID }
+=head2 create_role { object => OBJ, domain => DOMAIN, type => TYPE, instance => ID }
A helper subroutine which creates a role group. Takes the following arguments:
@@ -547,7 +547,7 @@
=cut
-sub create_role_group {
+sub create_role {
my $self = shift;
my %args = (
domain => undef,
Modified: rt/3.999/trunk/lib/RT/Model/Queue.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/Queue.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/Queue.pm Sat Mar 21 00:07:56 2009
@@ -505,7 +505,7 @@
my $role = shift;
my $group = RT::Model::Group->new( current_user => $self->current_user );
if ( $self->current_user_has_right('SeeQueue') ) {
- $group->load_role_group( type => $role, object => $self );
+ $group->load_role( type => $role, object => $self );
}
return ($group);
}
Modified: rt/3.999/trunk/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/Ticket.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/Ticket.pm Sat Mar 21 00:07:56 2009
@@ -586,7 +586,7 @@
return ( 0, 0, _("Ticket could not be created due to an internal error") );
}
- ((my $owner_group), $msg) = $self->create_role_group('owner');
+ ((my $owner_group), $msg) = $self->create_role('owner');
unless ( $owner_group ) {
Jifty->log->fatal( "Aborting ticket creation because of above error." );
Jifty->handle->rollback();
Modified: rt/3.999/trunk/lib/RT/Model/User.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/User.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/User.pm Sat Mar 21 00:07:56 2009
@@ -254,7 +254,7 @@
}
my $everyone = RT::Model::Group->new( current_user => $self->current_user );
- $everyone->load_system_internal_group('Everyone');
+ $everyone->load_system_internal('Everyone');
unless ( $everyone->id ) {
Jifty->log->fatal("Could not load Everyone group on user creation.");
Jifty->handle->rollback();
@@ -273,9 +273,9 @@
my $access_class = RT::Model::Group->new( current_user => $self->current_user );
if ($privileged) {
- $access_class->load_system_internal_group('privileged');
+ $access_class->load_system_internal('privileged');
} else {
- $access_class->load_system_internal_group('Unprivileged');
+ $access_class->load_system_internal('Unprivileged');
}
unless ( $access_class->id ) {
@@ -329,7 +329,7 @@
return ( 0, _('No permission to create users') );
}
my $priv = RT::Model::Group->new( current_user => $self->current_user );
- $priv->load_system_internal_group('privileged');
+ $priv->load_system_internal('privileged');
unless ( $priv->id ) {
Jifty->log->fatal("Could not find privileged pseudogroup");
@@ -337,7 +337,7 @@
}
my $unpriv = RT::Model::Group->new( current_user => $self->current_user );
- $unpriv->load_system_internal_group('Unprivileged');
+ $unpriv->load_system_internal('Unprivileged');
unless ( $unpriv->id ) {
Jifty->log->fatal("Could not find unprivileged pseudogroup");
return ( 0, _("Failed to find 'Unprivileged' users pseudogroup") );
@@ -402,7 +402,7 @@
sub privileged {
my $self = shift;
my $priv = RT::Model::Group->new( current_user => $self->current_user );
- $priv->load_system_internal_group('privileged');
+ $priv->load_system_internal('privileged');
if ( $priv->has_member( $self->principal ) ) {
return (1);
} else {
Modified: rt/3.999/trunk/lib/RT/Model/UserCollection.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/UserCollection.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/UserCollection.pm Sat Mar 21 00:07:56 2009
@@ -211,7 +211,7 @@
my $self = shift;
my $priv = RT::Model::Group->new( current_user => $self->current_user );
- $priv->load_system_internal_group('privileged');
+ $priv->load_system_internal('privileged');
unless ( $priv->id ) {
Jifty->log->fatal("Couldn't find a privileged users group");
}
Modified: rt/3.999/trunk/lib/RT/Shredder/User.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Shredder/User.pm (original)
+++ rt/3.999/trunk/lib/RT/Shredder/User.pm Sat Mar 21 00:07:56 2009
@@ -96,7 +96,7 @@
);
# ACL equivalence group
- # don't use load_acl_equivalence_group cause it may not exists any more
+ # don't use load_acl_equivalence cause it may not exists any more
my $objs = RT::Model::GroupCollection->new( current_user => $self->current_user );
$objs->limit( column => 'domain', value => 'ACLEquivalence' );
$objs->limit( column => 'instance', value => $self->id );
@@ -158,7 +158,7 @@
}
$obj = RT::Model::Group->new( current_user => RT->system_user );
- $obj->load_acl_equivalence_group( $self->principal );
+ $obj->load_acl_equivalence( $self->principal );
if ( $obj && defined $obj->id ) {
push( @$list, $obj );
} else {
Modified: rt/3.999/trunk/lib/RT/Test.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Test.pm (original)
+++ rt/3.999/trunk/lib/RT/Test.pm Sat Mar 21 00:07:56 2009
@@ -241,7 +241,7 @@
# add new user to groups
foreach (@$MemberOf) {
my $group = RT::Model::Group->new( current_user => RT->system_user() );
- $group->load_user_defined_group($_);
+ $group->load_user_defined($_);
die "couldn't load group '$_'" unless $group->id;
$group->add_member( $obj->id );
}
@@ -384,7 +384,7 @@
unless ( ref $principal ) {
if ( $principal =~ /^(everyone|(?:un)?privileged)$/i ) {
$principal = RT::Model::Group->new( current_user => RT->system_user );
- $principal->load_system_internal_group($1);
+ $principal->load_system_internal($1);
} else {
die "principal is not an object, but also is not name of a system group";
}
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 Sat Mar 21 00:07:56 2009
@@ -60,7 +60,7 @@
% while (my $Member = $Users->next()) {
% my $user_object = $Member->member_obj->object();
% my $group = RT::Model::Group->new( current_user => Jifty->web->current_user );
-% $group->load_acl_equivalence_group($Member->member_obj);
+% $group->load_acl_equivalence($Member->member_obj);
<tr align="right">
<td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
<td>
@@ -94,7 +94,7 @@
# Find out which users we want to display ACL selects for
my $privileged = RT::Model::Group->new( current_user => Jifty->web->current_user );
-$privileged->load_system_internal_group('privileged');
+$privileged->load_system_internal('privileged');
my $Users = $privileged->members;
my $title = _('Modify user rights for custom field %1', $CustomFieldObj->name);
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 Sat Mar 21 00:07:56 2009
@@ -92,7 +92,7 @@
$princ->load($principal_id);
if ($princ->type eq 'User') {
my $group = RT::Model::Group->new(current_user => RT->system_user);
- $group->load_acl_equivalence_group($princ);
+ $group->load_acl_equivalence($princ);
$principal_id = $group->principal_id;
}
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 Sat Mar 21 00:07:56 2009
@@ -58,7 +58,7 @@
% while ( my $user_object = $Users->next ) {
% my $group = RT::Model::Group->new( current_user => Jifty->web->current_user );
-% $group->load_acl_equivalence_group( $user_object );
+% $group->load_acl_equivalence( $user_object );
<tr align="right">
<td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
<td><& /Admin/Elements/SelectRights,
@@ -84,7 +84,7 @@
# Find out which users we want to display ACL selects for
my $privileged = RT::Model::Group->new( current_user => Jifty->web->current_user );
-$privileged->load_system_internal_group('privileged');
+$privileged->load_system_internal('privileged');
my $Users = $privileged->user_members;
$Users->order_by( column => $Userorder_by, order => $userorder );
Modified: rt/3.999/trunk/share/html/Admin/Groups/Modify.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Groups/Modify.html (original)
+++ rt/3.999/trunk/share/html/Admin/Groups/Modify.html Sat Mar 21 00:07:56 2009
@@ -110,7 +110,7 @@
$current_tab = 'Admin/Groups/Modify.html?id='.$id;
if ($id eq 'new' ) {
- my ($create_id, $create_msg) = $Group->create_user_defined_group(name =>
+ my ($create_id, $create_msg) = $Group->create_user_defined(name =>
"$name");
unless ($create_id) {
abort (_("Group could not be Created: %1", $create_msg));
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 Sat Mar 21 00:07:56 2009
@@ -96,7 +96,7 @@
# Find out which users we want to display ACL selects for
my $privileged = RT::Model::Group->new( current_user => Jifty->web->current_user );
-$privileged->load_system_internal_group('privileged');
+$privileged->load_system_internal('privileged');
my $Users = $privileged->members;
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 Sat Mar 21 00:07:56 2009
@@ -61,7 +61,7 @@
% while (my $Member = $Users->next()) {
% my $user_object = $Member->member_obj->object();
% my $group = RT::Model::Group->new( current_user => Jifty->web->current_user );
-% $group->load_acl_equivalence_group($Member->member_obj);
+% $group->load_acl_equivalence($Member->member_obj);
<tr align="right">
<td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
<td>
@@ -95,7 +95,7 @@
# Find out which users we want to display ACL selects for
my $privileged = RT::Model::Group->new( current_user => Jifty->web->current_user );
-$privileged->load_system_internal_group('privileged');
+$privileged->load_system_internal('privileged');
my $Users = $privileged->members;
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 Sat Mar 21 00:07:56 2009
@@ -101,7 +101,7 @@
if ( $update ) {
foreach my $gid( @add ) {
my $group = RT::Model::Group->new( current_user => Jifty->web->current_user );
- $group->load_user_defined_group( $gid );
+ $group->load_user_defined( $gid );
unless ( $group->id ) {
push @results, _( "Couldn't load group #%1", $gid );
next;
@@ -111,7 +111,7 @@
}
foreach my $gid( @delete ) {
my $group = RT::Model::Group->new( current_user => Jifty->web->current_user );
- $group->load_user_defined_group( $gid );
+ $group->load_user_defined( $gid );
unless ( $group->id ) {
push @results, _( "Couldn't load group #%1", $gid );
next;
Modified: rt/3.999/trunk/share/html/REST/1.0/Forms/group/default
==============================================================================
--- rt/3.999/trunk/share/html/REST/1.0/Forms/group/default (original)
+++ rt/3.999/trunk/share/html/REST/1.0/Forms/group/default Sat Mar 21 00:07:56 2009
@@ -93,7 +93,7 @@
}
}
- $group->create_user_defined_group(%v);
+ $group->create_user_defined(%v);
unless ($group->Id) {
return [ "# Could not create group.", [], {}, 1 ];
}
Modified: rt/3.999/trunk/share/html/User/Groups/Modify.html
==============================================================================
--- rt/3.999/trunk/share/html/User/Groups/Modify.html (original)
+++ rt/3.999/trunk/share/html/User/Groups/Modify.html Sat Mar 21 00:07:56 2009
@@ -93,7 +93,7 @@
else {
if ( defined ($id) && $id eq 'new' ) {
- my ( $id, $msg ) = $Group->create_personal_group(
+ my ( $id, $msg ) = $Group->create_personal(
name => "$name",
principal_id => Jifty->web->current_user->id
);
Modified: rt/3.999/trunk/t/api/cf_external.t
==============================================================================
--- rt/3.999/trunk/t/api/cf_external.t (original)
+++ rt/3.999/trunk/t/api/cf_external.t Sat Mar 21 00:07:56 2009
@@ -35,7 +35,7 @@
{
# create at least on group for the tests
my $group = RT::Model::Group->new(current_user => RT->system_user );
- my ($ret, $msg) = $group->create_user_defined_group( name => $q->name );
+ my ($ret, $msg) = $group->create_user_defined( name => $q->name );
ok $ret, 'Created group' or diag "error: $msg";
}
Modified: rt/3.999/trunk/t/api/group.t
==============================================================================
--- rt/3.999/trunk/t/api/group.t (original)
+++ rt/3.999/trunk/t/api/group.t Sat Mar 21 00:07:56 2009
@@ -13,13 +13,13 @@
ok (require RT::Model::Group);
ok (my $group = RT::Model::Group->new(current_user => RT->system_user), "instantiated a group object");
-ok (my ($id, $msg) = $group->create_user_defined_group( name => 'TestGroup', description => 'A test group',
+ok (my ($id, $msg) = $group->create_user_defined( name => 'TestGroup', description => 'A test group',
), 'Created a new group');
isnt ($id , 0, "Group id is $id");
is ($group->name , 'TestGroup', "The group's name is 'TestGroup'");
my $ng = RT::Model::Group->new(current_user => RT->system_user);
-ok($ng->load_user_defined_group('TestGroup'), "Loaded testgroup");
+ok($ng->load_user_defined('TestGroup'), "Loaded testgroup");
is($ng->id , $group->id, "Loaded the right group");
@@ -33,7 +33,7 @@
# Group 1 now has members 1, 2 ,3
my $group_2 = RT::Model::Group->new(current_user => RT->system_user);
-ok (my ($id_2, $msg_2) = $group_2->create_user_defined_group( name => 'TestGroup2', description => 'A second test group'), , 'Created a new group');
+ok (my ($id_2, $msg_2) = $group_2->create_user_defined( name => 'TestGroup2', description => 'A second test group'), , 'Created a new group');
isnt ($id_2 , 0, "Created group 2 ok- $msg_2 ");
ok (($id,$msg) = $group_2->add_member($ng->principal_id), "Made TestGroup a member of testgroup2");
ok($id, $msg);
@@ -43,7 +43,7 @@
# Group 2 how has 1, g1->{1, 2,3}
my $group_3 = RT::Model::Group->new(current_user => RT->system_user);
-ok (my ($id_3, $msg_3) = $group_3->create_user_defined_group( name => 'TestGroup3', description => 'A second test group'), 'Created a new group');
+ok (my ($id_3, $msg_3) = $group_3->create_user_defined( name => 'TestGroup3', description => 'A second test group'), 'Created a new group');
isnt ($id_3 , 0, "Created group 3 ok - $msg_3");
ok (($id,$msg) =$group_3->add_member($group_2->principal_id), "Made TestGroup a member of testgroup2");
ok($id, $msg);
@@ -69,9 +69,9 @@
#Gotta reload the group objects, since we've been messing with various internals.
# we shouldn't need to do this.
-#$ng->load_user_defined_group('TestGroup');
-#$group_2->load_user_defined_group('TestGroup2');
-#$group_3->load_user_defined_group('TestGroup');
+#$ng->load_user_defined('TestGroup');
+#$group_2->load_user_defined('TestGroup2');
+#$group_3->load_user_defined('TestGroup');
# G1 now has 1, 3
# Group 2 how has 1, g1->{1, 3}
Modified: rt/3.999/trunk/t/api/groups.t
==============================================================================
--- rt/3.999/trunk/t/api/groups.t (original)
+++ rt/3.999/trunk/t/api/groups.t Sat Mar 21 00:07:56 2009
@@ -15,7 +15,7 @@
# next had bugs
# Groups->limit( column => 'id', operator => '!=', value => xx );
my $g = RT::Model::Group->new(current_user => RT->system_user);
-my ($id, $msg) = $g->create_user_defined_group(name => 'GroupsNotEqualTest');
+my ($id, $msg) = $g->create_user_defined(name => 'GroupsNotEqualTest');
ok ($id, "Created group #". $g->id) or diag("error: $msg");
my $groups = RT::Model::GroupCollection->new(current_user => RT->system_user);
@@ -34,7 +34,7 @@
ok ($id, 'Created user') or diag "error: $msg";
my $g = RT::Model::Group->new(current_user => RT->system_user);
-($id, $msg) = $g->create_user_defined_group(name => 'Membertests');
+($id, $msg) = $g->create_user_defined(name => 'Membertests');
ok ($id, $msg);
my ($aid, $amsg) =$g->add_member($u->id);
@@ -62,7 +62,7 @@
ok ($id,$msg);
my $global_admin_cc = RT::Model::Group->new(current_user => RT->system_user);
-$global_admin_cc->load_role_group(object => RT->system, type => 'admin_cc');
+$global_admin_cc->load_role(object => RT->system, type => 'admin_cc');
ok($global_admin_cc->id, "Found the global admincc group");
my $groups = RT::Model::GroupCollection->new(current_user => RT->system_user);
$groups->with_right(right => 'OwnTicket', object => $q);
@@ -80,7 +80,7 @@
is($groups->count, 3);
my $RTxGroup = RT::Model::Group->new(current_user => RT->system_user);
-($id, $msg) = $RTxGroup->create_user_defined_group( name => 'RTxGroup', description => "RTx extension group");
+($id, $msg) = $RTxGroup->create_user_defined( name => 'RTxGroup', description => "RTx extension group");
ok ($id,$msg);
is ($RTxGroup->id, $id, "group loaded");
Modified: rt/3.999/trunk/t/api/queue.t
==============================================================================
--- rt/3.999/trunk/t/api/queue.t (original)
+++ rt/3.999/trunk/t/api/queue.t Sat Mar 21 00:07:56 2009
@@ -37,14 +37,14 @@
{
my $group = RT::Model::Group->new(current_user => RT->system_user);
- ok($group->load_role_group(object => $Queue, type=> 'cc'));
+ ok($group->load_role(object => $Queue, type=> 'cc'));
ok (!$group->id, "No cc group as there are no ccs yet");
my ($status, $msg) = $Queue->add_watcher(type => 'cc', email => 'bob at fsck.com');
ok ($status, "Added bob at fsck.com as a cc") or diag "error: $msg";
$group = RT::Model::Group->new(current_user => RT->system_user);
- ok ($group->load_role_group(object => $Queue, type=> 'cc'));
+ ok ($group->load_role(object => $Queue, type=> 'cc'));
ok ($group->id, "Found the cc object for this Queue");
ok (my $bob = RT::Model::User->new(current_user => RT->system_user), "Creating a bob rt::user");
@@ -73,7 +73,7 @@
{
my $group = RT::Model::Group->new(current_user => RT->system_user);
- ok($group->load_role_group(object => $Queue, type=> 'admin_cc'));
+ ok($group->load_role(object => $Queue, type=> 'admin_cc'));
ok (!$group->id, "No admin_cc group as there are no admin ccs yet");
}
Modified: rt/3.999/trunk/t/api/rights.t
==============================================================================
--- rt/3.999/trunk/t/api/rights.t (original)
+++ rt/3.999/trunk/t/api/rights.t Sat Mar 21 00:07:56 2009
@@ -87,7 +87,7 @@
ok( !$user->has_right( right => 'ReplyToTicket', object => $queue ), "user can't reply to ticket" );
my $group = RT::Model::Group->new(current_user => RT->system_user );
-ok( $group->create_role_group( object => $queue, type=> 'owner' ), "load queue owners role group" );
+ok( $group->create_role( object => $queue, type=> 'owner' ), "load queue owners role group" );
my $ace = RT::Model::ACE->new(current_user => RT->system_user );
my ($ace_id, $msg) = $group->principal->grant_right( right => 'ReplyToTicket', object => $queue );
ok( $ace_id, "Granted queue owners role group with ReplyToTicket right: $msg" );
@@ -113,7 +113,7 @@
# Testing of equiv_objects
$group = RT::Model::Group->new(current_user => RT->system_user );
-ok( $group->create_role_group( object => $queue, type=> 'admin_cc' ), "load queue admin_cc role group" );
+ok( $group->create_role( object => $queue, type=> 'admin_cc' ), "load queue admin_cc role group" );
$ace = RT::Model::ACE->new(current_user => RT->system_user );
($ace_id, $msg) = $group->principal->grant_right( right => 'ModifyTicket', object => $queue );
ok( $ace_id, "Granted queue admin_cc role group with ModifyTicket right: $msg" );
Modified: rt/3.999/trunk/t/api/ticket.t
==============================================================================
--- rt/3.999/trunk/t/api/ticket.t (original)
+++ rt/3.999/trunk/t/api/ticket.t Sat Mar 21 00:07:56 2009
@@ -104,7 +104,7 @@
);
ok ($id, "Ticket $id was Created");
ok(my $group = RT::Model::Group->new(current_user => RT->system_user));
-ok($group->load_role_group(object => $ticket, type=> 'requestor'));
+ok($group->load_role(object => $ticket, type=> 'requestor'));
ok ($group->id, "Found the requestors object for this ticket");
ok(my $jesse = RT::Model::User->new(current_user => RT->system_user), "Creating a jesse rt::user");
@@ -124,15 +124,15 @@
$group = RT::Model::Group->new(current_user => RT->system_user);
-ok($group->load_role_group(object => $ticket, type => 'cc'));
+ok($group->load_role(object => $ticket, type => 'cc'));
ok (!$group->id, "Not found the cc object for this ticket");
$group = RT::Model::Group->new(current_user => RT->system_user);
-ok($group->load_role_group(object => $ticket, type=> 'admin_cc'));
+ok($group->load_role(object => $ticket, type=> 'admin_cc'));
ok (!$group->id, "Not found the admin_cc object for this ticket");
$group = RT::Model::Group->new(current_user => RT->system_user);
-ok($group->load_role_group(object => $ticket, type=> 'owner'));
+ok($group->load_role(object => $ticket, type=> 'owner'));
ok ($group->id, "Found the owner object for this ticket");
ok($group->has_member(RT->nobody->user_object->principal), "the owner group has the member 'RT_System'");
Modified: rt/3.999/trunk/t/api/user.t
==============================================================================
--- rt/3.999/trunk/t/api/user.t (original)
+++ rt/3.999/trunk/t/api/user.t Sat Mar 21 00:07:56 2009
@@ -102,7 +102,7 @@
ok($rootq->id, "Loaded the first queue");
for my $role ( qw/owner requestor cc admin_cc/ ) {
- $rootq->create_role_group( $role );
+ $rootq->create_role( $role );
}
ok ($rootq->current_user->has_right(right=> 'CreateTicket', object => $rootq), "Root can create tickets");
@@ -139,7 +139,7 @@
ok (!$new_user->has_right( object => $new_tick, right => 'ModifyTicket'), "User can't modify the ticket without group membership");
# Create a new group
my $group = RT::Model::Group->new(current_user => RT->system_user);
-$group->create_user_defined_group(name => 'ACLTest'.$$);
+$group->create_user_defined(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->grant_right( object => $q, right => 'ModifyTicket'),"Granted the group the right to modify tickets");
@@ -174,7 +174,7 @@
# Create a subgroup
my $subgroup = RT::Model::Group->new(current_user => RT->system_user);
-$subgroup->create_user_defined_group(name => 'Subgrouptest'.$$);
+$subgroup->create_user_defined(name => 'Subgrouptest'.$$);
ok($subgroup->id, "Created a new group ".$subgroup->id."Ok");
#Add the subgroup as a subgroup of the group
my ($said, $samsg) = $group->add_member($subgroup->principal_id);
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 Sat Mar 21 00:07:56 2009
@@ -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);
+$group->load_acl_equivalence($RTxUser->principal);
my $RTxSysObj = {};
bless $RTxSysObj, 'RTx::System';
*RTx::System::Id = sub { 1; };
Modified: rt/3.999/trunk/t/mail/gateway.t
==============================================================================
--- rt/3.999/trunk/t/mail/gateway.t (original)
+++ rt/3.999/trunk/t/mail/gateway.t Sat Mar 21 00:07:56 2009
@@ -110,7 +110,7 @@
diag "revoke rights tests depend on" if $ENV{'TEST_VERBOSE'};
{
$everyone_group = RT::Model::Group->new(current_user => RT->system_user );
- $everyone_group->load_system_internal_group( 'Everyone' );
+ $everyone_group->load_system_internal( 'Everyone' );
ok ($everyone_group->id, "Found group 'everyone'");
foreach( qw(CreateTicket ReplyToTicket CommentOnTicket) ) {
@@ -774,7 +774,7 @@
my $group = RT::Model::Group->new(current_user => RT->system_user );
-ok( $group->create_role_group( object => $queue, type=> 'owner' ), "load queue owners role group" );
+ok( $group->create_role( object => $queue, type=> 'owner' ), "load queue owners role group" );
$ace = RT::Model::ACE->new(current_user => RT->system_user );
($ace_id, $msg) = $group->principal->grant_right( right => 'ReplyToTicket', object => $queue );
ok( $ace_id, "Granted queue owners role group with ReplyToTicket right" );
Modified: rt/3.999/trunk/t/mail/gnupg-realmail.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-realmail.t (original)
+++ rt/3.999/trunk/t/mail/gnupg-realmail.t Sat Mar 21 00:07:56 2009
@@ -44,7 +44,7 @@
my $everyone;
{
$everyone = RT::Model::Group->new(current_user => RT->system_user );
- $everyone->load_system_internal_group('Everyone');
+ $everyone->load_system_internal('Everyone');
ok $everyone->id, "loaded 'everyone' group";
}
Modified: rt/3.999/trunk/t/mail/gnupg-reverification.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-reverification.t (original)
+++ rt/3.999/trunk/t/mail/gnupg-reverification.t Sat Mar 21 00:07:56 2009
@@ -32,7 +32,7 @@
my $everyone;
{
$everyone = RT::Model::Group->new(current_user => RT->system_user );
- $everyone->load_system_internal_group('Everyone');
+ $everyone->load_system_internal('Everyone');
ok $everyone->id, "loaded 'everyone' group";
}
Modified: rt/3.999/trunk/t/mail/sendmail.t
==============================================================================
--- rt/3.999/trunk/t/mail/sendmail.t (original)
+++ rt/3.999/trunk/t/mail/sendmail.t Sat Mar 21 00:07:56 2009
@@ -15,7 +15,7 @@
#Were not testing acls here.
my $everyone = RT::Model::Group->new(current_user => RT->system_user);
-$everyone->load_system_internal_group('Everyone');
+$everyone->load_system_internal('Everyone');
$everyone->principal->grant_right( right =>'SuperUser' );
Modified: rt/3.999/trunk/t/maildigest/attributes.t
==============================================================================
--- rt/3.999/trunk/t/maildigest/attributes.t (original)
+++ rt/3.999/trunk/t/maildigest/attributes.t Sat Mar 21 00:07:56 2009
@@ -49,7 +49,7 @@
# Allow anyone to open a ticket on the test queue.
my $everyone = RT::Model::Group->new(current_user => RT->system_user );
-( $ret, $msg ) = $everyone->load_system_internal_group( 'Everyone' );
+( $ret, $msg ) = $everyone->load_system_internal( 'Everyone' );
ok( $ret, "Loaded 'everyone' group: $msg" );
( $ret, $msg ) = $everyone->principal->grant_right( right => 'CreateTicket',
Modified: rt/3.999/trunk/t/savedsearch.t
==============================================================================
--- rt/3.999/trunk/t/savedsearch.t (original)
+++ rt/3.999/trunk/t/savedsearch.t Sat Mar 21 00:07:56 2009
@@ -27,14 +27,14 @@
# 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->create_user_defined(name => 'searchgroup1'.$$);
$ingroup->add_member($searchuser->id);
$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);
-$outgroup->create_user_defined_group(name => 'searchgroup2'.$$);
+$outgroup->create_user_defined(name => 'searchgroup2'.$$);
$outgroup->add_member(RT->system_user->id);
my $queue = RT::Model::Queue->new(current_user => RT->system_user);
Modified: rt/3.999/trunk/t/shredder/02group_member.t
==============================================================================
--- rt/3.999/trunk/t/shredder/02group_member.t (original)
+++ rt/3.999/trunk/t/shredder/02group_member.t Sat Mar 21 00:07:56 2009
@@ -15,12 +15,12 @@
{
RT::Test::Shredder::create_savepoint('clean');
my $pgroup = RT::Model::Group->new(current_user => RT->system_user );
- my ($pgid) = $pgroup->create_user_defined_group( name => 'Parent group' );
+ my ($pgid) = $pgroup->create_user_defined( name => 'Parent group' );
ok( $pgid, "Created parent group" );
is( $pgroup->id, $pgid, "id is correct" );
my $cgroup = RT::Model::Group->new(current_user => RT->system_user );
- my ($cgid) = $cgroup->create_user_defined_group( name => 'Child group' );
+ my ($cgid) = $cgroup->create_user_defined( name => 'Child group' );
ok( $cgid, "Created child group" );
is( $cgroup->id, $cgid, "id is correct" );
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 Sat Mar 21 00:07:56 2009
@@ -76,7 +76,7 @@
ok($id, 'Created queue') or diag "error: $msg";
my $group = RT::Model::Group->new(current_user => RT->system_user );
- $group->load_system_internal_group('Everyone');
+ $group->load_system_internal('Everyone');
ok($group->id, 'loaded group');
($id, $msg) = $group->principal->grant_right(
@@ -96,7 +96,7 @@
# XXX, FIXME: if uncomment these lines then we'll get 'Bizarre...'
# RT::Test::Shredder::create_savepoint('clean');
my $group = RT::Model::Group->new(current_user => RT->system_user );
- my ($id, $msg) = $group->create_user_defined_group(name => 'my group');
+ my ($id, $msg) = $group->create_user_defined(name => 'my group');
ok($id, 'Created group') or diag "error: $msg";
RT::Test::Shredder::create_savepoint('bqcreate');
Modified: rt/3.999/trunk/t/ticket/deferred_owner.t
==============================================================================
--- rt/3.999/trunk/t/ticket/deferred_owner.t (original)
+++ rt/3.999/trunk/t/ticket/deferred_owner.t Sat Mar 21 00:07:56 2009
@@ -15,11 +15,11 @@
my $queue = RT::Test->load_or_create_queue( name => 'General' );
ok $queue && $queue->id, 'loaded or created queue';
-my ( $ret, $msg ) = $queue->create_role_group( 'cc' );
+my ( $ret, $msg ) = $queue->create_role( 'cc' );
ok $ret, "created cc group: $msg";
my $owner_role_group = RT::Model::Group->new(current_user => RT->system_user );
-$owner_role_group->create_role_group( type => 'owner', object => $queue );
+$owner_role_group->create_role( type => 'owner', object => $queue );
ok $owner_role_group->id, 'loaded owners role group of the queue';
diag "check that deffering owner doesn't regress" if $ENV{'TEST_VERBOSE'};
Modified: rt/3.999/trunk/t/ticket/requestor-order.t
==============================================================================
--- rt/3.999/trunk/t/ticket/requestor-order.t (original)
+++ rt/3.999/trunk/t/ticket/requestor-order.t Sat Mar 21 00:07:56 2009
@@ -103,7 +103,7 @@
my $g = RT::Model::Group->new(current_user => RT->system_user);
my ($gid);
- ($gid, $msg) = $g->create_user_defined_group(name => '20-sort-by-requestor.t-'.rand(200));
+ ($gid, $msg) = $g->create_user_defined(name => '20-sort-by-requestor.t-'.rand(200));
ok($gid, "Created group") or diag("error: $msg");
($id, $msg) = $t->role_group("requestor")->add_member( $gid );
Modified: rt/3.999/trunk/t/ticket/search_by_watcher.t
==============================================================================
--- rt/3.999/trunk/t/ticket/search_by_watcher.t (original)
+++ rt/3.999/trunk/t/ticket/search_by_watcher.t Sat Mar 21 00:07:56 2009
@@ -250,7 +250,7 @@
{
my $everyone = RT::Model::Group->new(current_user => RT->system_user );
- $everyone->load_system_internal_group('Everyone');
+ $everyone->load_system_internal('Everyone');
ok($everyone->id, "loaded 'everyone' group");
my($id, $msg) = $everyone->principal->grant_right( right => 'OwnTicket',
object => $q
Modified: rt/3.999/trunk/t/web/dashboards-groups.t
==============================================================================
--- rt/3.999/trunk/t/web/dashboards-groups.t (original)
+++ rt/3.999/trunk/t/web/dashboards-groups.t Sat Mar 21 00:07:56 2009
@@ -31,11 +31,11 @@
# }}}
# create and test groups (outer < inner < user) {{{
my $inner_group = RT::Model::Group->new(current_user => RT->system_user);
-($ok, $msg) = $inner_group->create_user_defined_group(name => "inner", description => "inner group");
+($ok, $msg) = $inner_group->create_user_defined(name => "inner", description => "inner group");
ok($ok, "created inner group: $msg");
my $outer_group = RT::Model::Group->new(current_user => RT->system_user);
-($ok, $msg) = $outer_group->create_user_defined_group(name => "outer", description => "outer group");
+($ok, $msg) = $outer_group->create_user_defined(name => "outer", description => "outer group");
ok($ok, "created outer group: $msg");
($ok, $msg) = $outer_group->add_member($inner_group->principal_id);
Modified: rt/3.999/trunk/t/web/rights.t
==============================================================================
--- rt/3.999/trunk/t/web/rights.t (original)
+++ rt/3.999/trunk/t/web/rights.t Sat Mar 21 00:07:56 2009
@@ -26,7 +26,7 @@
my ($everyone, $everyone_gid);
{
$everyone = RT::Model::Group->new(current_user => RT->system_user );
- $everyone->load_system_internal_group('Everyone');
+ $everyone->load_system_internal('Everyone');
ok($everyone_gid = $everyone->id, "loaded 'everyone' group");
}
Modified: rt/3.999/trunk/t/web/rights1.t
==============================================================================
--- rt/3.999/trunk/t/web/rights1.t (original)
+++ rt/3.999/trunk/t/web/rights1.t Sat Mar 21 00:07:56 2009
@@ -87,7 +87,7 @@
description => 'queue for SelectOwner testing');
ok($ret, "SelectOwner test queue creation. $msg");
my $group_obj = RT::Model::Group->new(current_user => RT->system_user);
-($ret, $msg) = $group_obj->create_user_defined_group(name => 'CustomerGroup-'.$$,
+($ret, $msg) = $group_obj->create_user_defined(name => 'CustomerGroup-'.$$,
description => 'group for SelectOwner testing');
ok($ret, "SelectOwner test group creation. $msg");
More information about the Rt-commit
mailing list