[Rt-commit] r18693 - in rt/3.999/trunk: lib/RT/Model lib/RT/ScripAction share/html/Admin/Groups share/html/REST/1.0/Forms/group share/html/Ticket/Elements
ruz at bestpractical.com
ruz at bestpractical.com
Wed Mar 4 23:18:33 EST 2009
Author: ruz
Date: Wed Mar 4 23:18:33 2009
New Revision: 18693
Modified:
rt/3.999/trunk/lib/RT/Model/Group.pm
rt/3.999/trunk/lib/RT/Model/Template.pm
rt/3.999/trunk/lib/RT/ScripAction/NotifyGroup.pm
rt/3.999/trunk/share/html/Admin/Global/UserRights.html
rt/3.999/trunk/share/html/Admin/Groups/Members.html
rt/3.999/trunk/share/html/REST/1.0/Forms/group/default
rt/3.999/trunk/share/html/Ticket/Elements/ShowGroupMembers
rt/3.999/trunk/share/html/Ticket/Elements/ShowRequestor
Log:
* more s/_obj$// in method names
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 Wed Mar 4 23:18:33 2009
@@ -805,7 +805,7 @@
my $self = shift;
my %addresses;
- my $members = $self->user_members_obj();
+ my $members = $self->user_members;
while ( my $member = $members->next ) {
$addresses{ $member->email } = 1;
}
Modified: rt/3.999/trunk/lib/RT/Model/Template.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/Template.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/Template.pm Wed Mar 4 23:18:33 2009
@@ -324,7 +324,7 @@
$args{'ticket'} = delete $args{'ticket_obj'} if $args{'ticket_obj'};
$args{'transaction'} = delete $args{'transaction_obj'}
if $args{'transaction_obj'};
- $args{'requestor'} = eval { $args{'ticket'}->role_group("requestor")->user_members_obj->first->name; }
+ $args{'requestor'} = eval { $args{'ticket'}->role_group("requestor")->user_members->first->name; }
if $args{'ticket'};
$args{'rtname'} = RT->config->get('rtname');
if ( $args{'ticket'} ) {
Modified: rt/3.999/trunk/lib/RT/ScripAction/NotifyGroup.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/ScripAction/NotifyGroup.pm (original)
+++ rt/3.999/trunk/lib/RT/ScripAction/NotifyGroup.pm Wed Mar 4 23:18:33 2009
@@ -145,7 +145,7 @@
my $self = shift;
my $obj = shift;
- my $members = $obj->user_members_obj;
+ my $members = $obj->user_members;
while ( my $m = $members->next ) {
$self->__handle_user_argument($m);
}
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 Wed Mar 4 23:18:33 2009
@@ -85,7 +85,7 @@
# Find out which users we want to display ACL selects for
my $privileged = RT::Model::Group->new();
$privileged->load_system_internal_group('privileged');
-my $Users = $privileged->user_members_obj();
+my $Users = $privileged->user_members;
$Users->order_by( column => $Userorder_by, order => $userorder );
Modified: rt/3.999/trunk/share/html/Admin/Groups/Members.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Groups/Members.html (original)
+++ rt/3.999/trunk/share/html/Admin/Groups/Members.html Wed Mar 4 23:18:33 2009
@@ -74,7 +74,7 @@
<em><&|/l&>(No members)</&></em>
% } else {
<&|/l&>Users</&>
-% my $Users = $Group->user_members_obj( recursively => 0 );
+% my $Users = $Group->user_members( recursively => 0 );
% $Users->order_by( column => $user_order_by, order => $userorder );
<ul>
% while ( my $user = $Users->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 Wed Mar 4 23:18:33 2009
@@ -118,7 +118,7 @@
my $GroupMembers = $group->members;
while ( my $mo = $GroupMembers->next() ) {
if ( $mo->member_obj->is_group ) {
- my $us = $mo->member_obj->object->user_members_obj();
+ my $us = $mo->member_obj->object->user_members;
my @users;
while ( my $u = $us->next() ) {
push @users, $u->real_name . ' <' . $u->email . '>';
Modified: rt/3.999/trunk/share/html/Ticket/Elements/ShowGroupMembers
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/ShowGroupMembers (original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/ShowGroupMembers Wed Mar 4 23:18:33 2009
@@ -47,12 +47,12 @@
%# END BPS TAGGED BLOCK }}}
%# Released under the terms of version 2 of the GNU Public License
-% my $Users = $group->user_members_obj( recursively => $recursively );
+% my $Users = $group->user_members( recursively => $recursively );
% while ( my $user = $Users->next ) {
<& /Elements/ShowUser, user => $user, ticket => $ticket &>
<& /Elements/ShowUserEmailFrequency, user => $user, ticket => $ticket &><br />
% }
-% my $Groups = $group->group_members_obj( recursively => $recursively );
+% my $Groups = $group->group_members( recursively => $recursively );
% $Groups->limit_to_user_defined_groups;
% while (my $group = $Groups->next) {
<&|/l&>Group</&>: <% $group->name %><br />
Modified: rt/3.999/trunk/share/html/Ticket/Elements/ShowRequestor
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/ShowRequestor (original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/ShowRequestor Wed Mar 4 23:18:33 2009
@@ -48,7 +48,7 @@
<%PERL>
my $rows = 10;
my $has_right_adminusers = Jifty->web->current_user->has_right(object => RT->system, right => 'AdminUsers');
-my $people = $ticket->role_group("requestor")->user_members_obj;
+my $people = $ticket->role_group("requestor")->user_members;
while ( my $requestor = $people->next ) {
next if $requestor->privileged;
my $name = $m->scomp('/Elements/ShowUser', user => $requestor);
More information about the Rt-commit
mailing list