[Rt-commit] rt branch, 3.999-trunk, updated. 8d58e29babf92972da6f31ebc3ca3dbb5aa3c0ad
sartak at bestpractical.com
sartak at bestpractical.com
Thu Dec 3 01:08:34 EST 2009
The branch, 3.999-trunk has been updated
via 8d58e29babf92972da6f31ebc3ca3dbb5aa3c0ad (commit)
via 4765995e5bf8f883949f4a9bd25b4080b07d86a5 (commit)
from f0ff59cb69bf510031961fb432b957721a2278ca (commit)
Summary of changes:
lib/RT/Action/EditTicketCFs.pm | 2 +-
lib/RT/Action/UpdateTicket.pm | 4 +-
lib/RT/Approval/Rule.pm | 2 +-
lib/RT/Dashboard.pm | 4 +-
lib/RT/HasRoleGroups.pm | 22 +++++++-------
lib/RT/IsPrincipal.pm | 4 +-
lib/RT/IsPrincipal/HasMembers.pm | 12 ++++----
lib/RT/IsPrincipal/HasNoMembers.pm | 6 ++--
lib/RT/Model/ACE.pm | 2 +-
lib/RT/Model/Attachment.pm | 6 ++--
lib/RT/Model/AttributeCollection.pm | 4 +-
lib/RT/Model/CachedGroupMember.pm | 6 ++--
lib/RT/Model/CustomField.pm | 22 +++++++-------
lib/RT/Model/CustomFieldValue.pm | 2 +-
lib/RT/Model/CustomFieldValueCollection/Groups.pm | 2 +-
lib/RT/Model/Group.pm | 12 ++++----
lib/RT/Model/GroupMember.pm | 12 +++----
lib/RT/Model/ObjectCustomField.pm | 6 ++--
lib/RT/Model/Principal.pm | 2 +-
lib/RT/Model/Queue.pm | 10 +++---
lib/RT/Model/ScripAction.pm | 4 +-
lib/RT/Model/Template.pm | 4 +-
lib/RT/Model/Ticket.pm | 32 ++++++++++----------
lib/RT/Model/TicketCollection.pm | 10 +++---
lib/RT/Model/Transaction.pm | 34 ++++++++++----------
lib/RT/Model/User.pm | 26 ++++++++--------
lib/RT/Model/UserCollection.pm | 2 +-
lib/RT/Record.pm | 34 ++++++++++----------
lib/RT/Report/Tickets.pm | 8 ++--
lib/RT/Rule.pm | 4 +-
lib/RT/SavedSearches.pm | 2 +-
lib/RT/ScripAction/CreateTickets.pm | 10 +++---
lib/RT/SharedSetting.pm | 8 ++--
lib/RT/Shredder/Attachment.pm | 2 +-
lib/RT/Shredder/CachedGroupMember.pm | 2 +-
lib/RT/Shredder/CustomField.pm | 2 +-
lib/RT/Shredder/Group.pm | 8 ++--
lib/RT/Shredder/GroupMember.pm | 2 +-
lib/RT/Shredder/Principal.pm | 2 +-
lib/RT/Shredder/Queue.pm | 6 ++--
lib/RT/Shredder/Record.pm | 4 +-
lib/RT/Shredder/Ticket.pm | 4 +-
lib/RT/Shredder/User.pm | 4 +-
lib/RT/URI.pm | 2 +-
lib/RT/URI/fsck_com_rt.pm | 2 +-
45 files changed, 179 insertions(+), 181 deletions(-)
- Log -----------------------------------------------------------------
commit 4765995e5bf8f883949f4a9bd25b4080b07d86a5
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Dec 3 00:52:32 2009 -0500
Get rid of many ->new(current_user => $self->current_user)
Jifty figures this out for us, no need to do it ourselves.
This trimmed down a *lot* of lines that were greater than 80
characters wide ;)
diff --git a/lib/RT/Action/EditTicketCFs.pm b/lib/RT/Action/EditTicketCFs.pm
index 9641cfe..4fabbd6 100644
--- a/lib/RT/Action/EditTicketCFs.pm
+++ b/lib/RT/Action/EditTicketCFs.pm
@@ -11,7 +11,7 @@ sub available_values {
my $self = shift;
my $id = shift;
next unless $id =~ /^\d+$/;
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
$cf->load($id);
my $values = $cf->values;
diff --git a/lib/RT/Action/UpdateTicket.pm b/lib/RT/Action/UpdateTicket.pm
index ff38f3d..c0860cd 100644
--- a/lib/RT/Action/UpdateTicket.pm
+++ b/lib/RT/Action/UpdateTicket.pm
@@ -68,7 +68,7 @@ sub _compute_possible_owners {
);
foreach my $object (@objects) {
- my $Users = RT::Model::UserCollection->new( current_user => $self->current_user );
+ my $Users = RT::Model::UserCollection->new;
$Users->who_have_right(
right => 'OwnTicket',
object => $object,
@@ -95,7 +95,7 @@ sub _compute_possible_owners {
sub _compute_possible_queues {
my $self = shift;
- my $q = RT::Model::QueueCollection->new( current_user => $self->current_user );
+ my $q = RT::Model::QueueCollection->new;
$q->find_all_rows;
my $queues;
diff --git a/lib/RT/Approval/Rule.pm b/lib/RT/Approval/Rule.pm
index 2613ef2..a786c9a 100644
--- a/lib/RT/Approval/Rule.pm
+++ b/lib/RT/Approval/Rule.pm
@@ -62,7 +62,7 @@ sub prepare {
sub get_template {
my ($self, $template_name, %args) = @_;
- my $template = RT::Model::Template->new( current_user => $self->current_user);
+ my $template = RT::Model::Template->new;
$template->load($template_name) or return;
my ($result, $msg) = $template->parse(%args);
diff --git a/lib/RT/Dashboard.pm b/lib/RT/Dashboard.pm
index da33860..befee7b 100644
--- a/lib/RT/Dashboard.pm
+++ b/lib/RT/Dashboard.pm
@@ -245,7 +245,7 @@ sub _privacy_objects {
object => RT->system,
);
- my $groups = RT::Model::GroupCollection->new( current_user => $CurrentUser );
+ my $groups = RT::Model::GroupCollection->new;
$groups->limit_to_user_defined_groups;
$groups->with_member(
principal => $CurrentUser->id,
@@ -259,7 +259,7 @@ sub _privacy_objects {
)
} @{ $groups->items_array_ref };
- push @objects, RT::System->new( current_user => $CurrentUser )
+ push @objects, RT::System->new
if $CurrentUser->has_right(
right => "${prefix}Dashboard",
object => RT->system,
diff --git a/lib/RT/HasRoleGroups.pm b/lib/RT/HasRoleGroups.pm
index 127d27d..f050a22 100644
--- a/lib/RT/HasRoleGroups.pm
+++ b/lib/RT/HasRoleGroups.pm
@@ -39,7 +39,7 @@ sub is_watcher {
);
# Load the relevant group.
- my $group = RT::Model::Group->new( current_user => $self->current_user );
+ my $group = RT::Model::Group->new;
$group->load_role(
object => $self,
type => $args{'type'},
@@ -51,7 +51,7 @@ sub is_watcher {
return 0 unless $args{'email'};
# Look up the specified user.
- my $user = RT::Model::User->new( current_user => $self->current_user );
+ my $user = RT::Model::User->new;
$user->load_by_email( $args{'email'} );
if ( $user->id ) {
$args{'principal'} = $user;
@@ -95,7 +95,7 @@ sub add_watcher {
my ( $addr ) = RT::EmailParser->parse_email_address( $args{email} );
if ($addr) {
$args{'email'} = $addr->address;
- my $user = RT::Model::User->new( current_user => $self->current_user );
+ my $user = RT::Model::User->new;
$user->load_by_email( $args{'email'} );
if ( $user->id ) {
$args{'principal'} = $user;
@@ -144,13 +144,13 @@ sub _add_watcher {
return ( 0, _("System internal error. Contact system administrator.") );
}
- my $principal = RT::Model::Principal->new( current_user => $self->current_user );
+ my $principal = RT::Model::Principal->new;
$principal->load( $args{'principal'} );
unless ( $principal->id ) {
return ( 0, _("Could not find principal #%1", $args{'principal'}) );
}
- my $group = RT::Model::Group->new( current_user => $self->current_user );
+ my $group = RT::Model::Group->new;
$group->create_role(
object => $self,
type => $args{'type'},
@@ -210,7 +210,7 @@ sub delete_watcher {
);
if ( $args{'email'} ) {
- my $user = RT::Model::User->new( current_user => $self->current_user );
+ my $user = RT::Model::User->new;
$user->load_by_email( $args{'email'} );
return ( 0, _("Could not find user with email %1", $args{'email'}) )
unless $user->id;
@@ -239,7 +239,7 @@ sub _delete_watcher {
);
if ( $args{'email'} ) {
- my $user = RT::Model::User->new( current_user => $self->current_user );
+ my $user = RT::Model::User->new;
$user->load_by_email( $args{'email'} );
return ( 0, _("Could not find user with email %1", $args{'email'}) )
unless $user->id;
@@ -253,7 +253,7 @@ sub _delete_watcher {
return ( 0, _("System internal error. Contact system administrator.") );
}
- my $principal = RT::Model::Principal->new( current_user => $self->current_user );
+ my $principal = RT::Model::Principal->new;
$principal->load( $args{'principal'} );
unless ( $principal->id ) {
return ( 0, _("Could not find principal #%1", $args{'principal'}) );
@@ -261,7 +261,7 @@ sub _delete_watcher {
# see if this user is already a watcher.
- my $group = RT::Model::Group->new( current_user => $self->current_user );
+ my $group = RT::Model::Group->new;
$group->load_role(
object => $self,
type => $args{'type'},
@@ -303,7 +303,7 @@ sub role_group {
my $self = shift;
my $role = shift;
- my $obj = RT::Model::Group->new( current_user => $self->current_user );
+ my $obj = RT::Model::Group->new;
$obj->load_role( object => $self, type => $role );
return $obj;
}
@@ -320,7 +320,7 @@ sub create_role {
my $self = shift;
my $type = shift;
- my $group = RT::Model::Group->new( current_user => $self->current_user );
+ my $group = RT::Model::Group->new;
my ($id, $msg) = $group->create_role(
object => $self,
type => $type,
diff --git a/lib/RT/IsPrincipal.pm b/lib/RT/IsPrincipal.pm
index 6bcf9de..56e6d49 100644
--- a/lib/RT/IsPrincipal.pm
+++ b/lib/RT/IsPrincipal.pm
@@ -31,7 +31,7 @@ sub disabled {
sub acl_equivalence_group {
my $self = shift;
- my $res = RT::Model::Group->new( current_user => $self->current_user );
+ my $res = RT::Model::Group->new;
$res->load_acl_equivalence( $self );
unless ( $res->id ) {
Jifty->log->fatal( "No ACL equiv group for principal #". $self->id );
@@ -64,7 +64,7 @@ sub principal {
return undef;
}
- my $res = RT::Model::Principal->new( current_user => $self->current_user );
+ my $res = RT::Model::Principal->new;
$res->load_by_id( $self->id );
unless ( $res->id ) {
Jifty->log->fatal( 'No principal for '. ref($self) .' #' . $self->id );
diff --git a/lib/RT/IsPrincipal/HasMembers.pm b/lib/RT/IsPrincipal/HasMembers.pm
index 2b67489..d525d84 100644
--- a/lib/RT/IsPrincipal/HasMembers.pm
+++ b/lib/RT/IsPrincipal/HasMembers.pm
@@ -24,7 +24,7 @@ sub members {
#If we don't have rights, don't include any results
# TODO XXX WHY IS THERE NO ACL CHECK HERE?
- my $res = $class->new( current_user => $self->current_user );
+ my $res = $class->new;
$res->limit_to_members_of_group( $self->id );
return $res;
@@ -45,7 +45,7 @@ sub group_members {
my $self = shift;
my %args = ( recursively => 1, @_ );
- my $groups = RT::Model::GroupCollection->new( current_user => $self->current_user );
+ my $groups = RT::Model::GroupCollection->new;
my $members_table = $args{'recursively'} ? 'CachedGroupMembers' : 'GroupMembers';
my $members_alias = $groups->new_alias($members_table);
@@ -87,7 +87,7 @@ sub user_members {
my $members_table = $args{'recursively'} ? 'CachedGroupMembers' : 'GroupMembers';
- my $users = RT::Model::UserCollection->new( current_user => $self->current_user );
+ my $users = RT::Model::UserCollection->new;
my $members_alias = $users->new_alias($members_table);
$users->join(
alias1 => $members_alias,
@@ -278,7 +278,7 @@ sub _add_member {
return ( 0, _("System error") );
}
- $principal = RT::Model::Principal->new( current_user => $self->current_user );
+ $principal = RT::Model::Principal->new;
$principal->load( $args{'principal'} );
unless ( $principal->id ) {
Jifty->log->error("Couldn't find that principal");
@@ -297,7 +297,7 @@ sub _add_member {
return ( 0, _("Groups can't be members of their members") );
}
- my $member_object = RT::Model::GroupMember->new( current_user => $self->current_user );
+ my $member_object = RT::Model::GroupMember->new;
my ($gm_id, $msg) = $member_object->create(
member => $object,
group => $self->principal,
@@ -347,7 +347,7 @@ sub _delete_member {
my $self = shift;
my $member_id = shift;
- my $member_obj = RT::Model::GroupMember->new( current_user => $self->current_user );
+ my $member_obj = RT::Model::GroupMember->new;
$member_obj->load_by_cols(
member_id => $member_id,
diff --git a/lib/RT/IsPrincipal/HasNoMembers.pm b/lib/RT/IsPrincipal/HasNoMembers.pm
index 6c79518..cdcbe0d 100644
--- a/lib/RT/IsPrincipal/HasNoMembers.pm
+++ b/lib/RT/IsPrincipal/HasNoMembers.pm
@@ -20,7 +20,7 @@ sub members {
? 'RT::Model::CachedGroupMemberCollection'
: 'RT::Model::GroupMemberCollection';
- my $res = $class->new( current_user => $self->current_user );
+ my $res = $class->new;
$res->limit( column => 'id', value => 0 );
return $res;
}
@@ -33,7 +33,7 @@ Returns an empty L<RT::Model::GroupCollection> object.
sub group_members {
my $self = shift;
- my $groups = RT::Model::GroupCollection->new( current_user => $self->current_user );
+ my $groups = RT::Model::GroupCollection->new;
$groups->limit( column => 'id', value => 0 );
return $groups;
}
@@ -54,7 +54,7 @@ sub user_members {
my $members_table = $args{'recursively'} ? 'CachedGroupMembers' : 'GroupMembers';
- my $users = RT::Model::UserCollection->new( current_user => $self->current_user );
+ my $users = RT::Model::UserCollection->new;
my $members_alias = $users->new_alias($members_table);
$users->join(
alias1 => $members_alias,
diff --git a/lib/RT/Model/ACE.pm b/lib/RT/Model/ACE.pm
index 522dddd..d02b07a 100755
--- a/lib/RT/Model/ACE.pm
+++ b/lib/RT/Model/ACE.pm
@@ -458,7 +458,7 @@ sub principal_to_acl_group {
return $principal->acl_equivalence_group
if blessed $principal;
- my $tmp = RT::Model::Principal->new( current_user => $self->current_user );
+ my $tmp = RT::Model::Principal->new;
$tmp->load( $principal );
unless ( $tmp->id ) {
return (undef, _( 'Principal %1 not found.', $principal ));
diff --git a/lib/RT/Model/Attachment.pm b/lib/RT/Model/Attachment.pm
index 9d83c60..3fd0fe8 100755
--- a/lib/RT/Model/Attachment.pm
+++ b/lib/RT/Model/Attachment.pm
@@ -176,7 +176,7 @@ sub create {
}
foreach my $part ( $Attachment->parts ) {
- my $SubAttachment = RT::Model::Attachment->new( current_user => $self->current_user );
+ my $SubAttachment = RT::Model::Attachment->new;
my ($id) = $SubAttachment->create(
transaction_id => $args{'transaction_id'},
parent => $id,
@@ -240,7 +240,7 @@ sub transaction {
unless ( $self->{_transaction_obj} ) {
$self->{_transaction_obj} =
- RT::Model::Transaction->new( current_user => $self->current_user );
+ RT::Model::Transaction->new;
$self->{_transaction_obj}->load( $self->transaction_id );
}
@@ -274,7 +274,7 @@ C<parent>.
sub children {
my $self = shift;
- my $kids = RT::Model::AttachmentCollection->new( current_user => $self->current_user );
+ my $kids = RT::Model::AttachmentCollection->new;
$kids->children_of( $self->id );
return ($kids);
}
diff --git a/lib/RT/Model/AttributeCollection.pm b/lib/RT/Model/AttributeCollection.pm
index f2c6044..d8de0ec 100644
--- a/lib/RT/Model/AttributeCollection.pm
+++ b/lib/RT/Model/AttributeCollection.pm
@@ -87,7 +87,7 @@ sub _attr_hash {
my $self = shift;
$self->_do_search if ( $self->{'must_redo_search'} );
unless ( $self->{'attr'} ) {
- $self->{'attr'}->{'__none'} = RT::Model::Attribute->new( current_user => $self->current_user );
+ $self->{'attr'}->{'__none'} = RT::Model::Attribute->new;
}
return ( $self->{'attr'} );
}
@@ -133,7 +133,7 @@ sub with_id {
my $self = shift;
my $id = shift;
- my $attr = RT::Model::Attribute->new( current_user => $self->current_user );
+ my $attr = RT::Model::Attribute->new;
$attr->load_by_cols( id => $id );
return ($attr);
}
diff --git a/lib/RT/Model/CachedGroupMember.pm b/lib/RT/Model/CachedGroupMember.pm
index aabb72a..2da9c67 100755
--- a/lib/RT/Model/CachedGroupMember.pm
+++ b/lib/RT/Model/CachedGroupMember.pm
@@ -167,7 +167,7 @@ sub create {
my $GroupMembers = $args{'member'}->object->members;
while ( my $member = $GroupMembers->next() ) {
- my $cached_member = RT::Model::CachedGroupMember->new( current_user => $self->current_user );
+ my $cached_member = RT::Model::CachedGroupMember->new;
my $c_id = $cached_member->create(
group => $args{'group'},
member => $member->member,
@@ -197,7 +197,7 @@ mysql supported foreign keys with cascading deletes.
sub delete {
my $self = shift;
- my $deletable = RT::Model::CachedGroupMemberCollection->new( current_user => $self->current_user );
+ my $deletable = RT::Model::CachedGroupMemberCollection->new;
$deletable->limit(
column => 'id',
operator => '!=',
@@ -266,7 +266,7 @@ sub set_disabled {
return ($err);
}
- my $deletable = RT::Model::CachedGroupMemberCollection->new( current_user => $self->current_user );
+ my $deletable = RT::Model::CachedGroupMemberCollection->new;
$deletable->limit(
column => 'via',
operator => '=',
diff --git a/lib/RT/Model/CustomField.pm b/lib/RT/Model/CustomField.pm
index 6d41e66..5969773 100755
--- a/lib/RT/Model/CustomField.pm
+++ b/lib/RT/Model/CustomField.pm
@@ -231,7 +231,7 @@ sub create {
}
$args{'lookup_type'} = 'RT::Model::Queue-RT::Model::Ticket';
} else {
- my $queue = RT::Model::Queue->new( current_user => $self->current_user );
+ my $queue = RT::Model::Queue->new;
$queue->load( $args{'queue'} );
unless ( $queue->id ) {
return ( 0, _("Queue not found") );
@@ -354,14 +354,14 @@ sub load_by_name {
# if we're looking for a queue by name, make it a number
if ( defined $args{'queue'} && $args{'queue'} =~ /\D/ ) {
- my $queue_obj = RT::Model::Queue->new( current_user => $self->current_user );
+ my $queue_obj = RT::Model::Queue->new;
$queue_obj->load( $args{'queue'} );
$args{'queue'} = $queue_obj->id;
}
# XXX - really naive implementation. Slow. - not really. still just one query
- my $CFs = RT::Model::CustomFieldCollection->new( current_user => $self->current_user );
+ my $CFs = RT::Model::CustomFieldCollection->new;
Carp::cluck unless ( $args{'name'} );
$CFs->limit(
column => 'name',
@@ -438,7 +438,7 @@ sub add_value {
return ( 0, _("Can't add a custom field value without a name") );
}
- my $newval = RT::Model::CustomFieldValue->new( current_user => $self->current_user );
+ my $newval = RT::Model::CustomFieldValue->new;
return $newval->create( %args, custom_field => $self->id );
}
@@ -459,7 +459,7 @@ sub delete_value {
return ( 0, _('Permission Denied') );
}
- my $val_to_del = RT::Model::CustomFieldValue->new( current_user => $self->current_user );
+ my $val_to_del = RT::Model::CustomFieldValue->new;
$val_to_del->load($id);
unless ( $val_to_del->id ) {
return ( 0, _("Couldn't find that value") );
@@ -788,7 +788,7 @@ sub set_lookup_type {
if ( $lookup ne $self->lookup_type ) {
# Okay... We need to invalidate our existing relationships
- my $ObjectCustomFields = RT::Model::ObjectCustomFieldCollection->new( current_user => $self->current_user );
+ my $ObjectCustomFields = RT::Model::ObjectCustomFieldCollection->new;
$ObjectCustomFields->limit_to_custom_field( $self->id );
$_->delete foreach @{ $ObjectCustomFields->items_array_ref };
}
@@ -873,7 +873,7 @@ sub add_to_object {
return ( 0, _('Permission Denied') );
}
- my $objectCF = RT::Model::ObjectCustomField->new( current_user => $self->current_user );
+ my $objectCF = RT::Model::ObjectCustomField->new;
$objectCF->load_by_cols( object_id => $id, custom_field => $self->id );
if ( $objectCF->id ) {
return ( 0, _("That is already the current value") );
@@ -904,7 +904,7 @@ sub remove_from_object {
return ( 0, _('Permission Denied') );
}
- my $objectCF = RT::Model::ObjectCustomField->new( current_user => $self->current_user );
+ my $objectCF = RT::Model::ObjectCustomField->new;
$objectCF->load_by_cols( object_id => $id, custom_field => $self->id );
unless ( $objectCF->id ) {
return ( 0, _("This custom field does not apply to that object") );
@@ -976,7 +976,7 @@ sub add_value_for_object {
$extra_values--;
}
}
- my $newval = RT::Model::ObjectCustomFieldValue->new( current_user => $self->current_user );
+ my $newval = RT::Model::ObjectCustomFieldValue->new;
my $val = $newval->create(
object_type => ref($obj),
object_id => $obj->id,
@@ -1056,7 +1056,7 @@ sub delete_value_for_object {
return ( 0, _('Permission Denied') );
}
- my $oldval = RT::Model::ObjectCustomFieldValue->new( current_user => $self->current_user );
+ my $oldval = RT::Model::ObjectCustomFieldValue->new;
if ( my $id = $args{'id'} ) {
$oldval->load($id);
@@ -1098,7 +1098,7 @@ sub values_for_object {
my $self = shift;
my $object = shift;
- my $values = RT::Model::ObjectCustomFieldValueCollection->new( current_user => $self->current_user );
+ my $values = RT::Model::ObjectCustomFieldValueCollection->new;
unless ( $self->current_user_has_right('SeeCustomField') ) {
# Return an empty object if they have no rights to see
diff --git a/lib/RT/Model/CustomFieldValue.pm b/lib/RT/Model/CustomFieldValue.pm
index 40fb35c..123bc5d 100644
--- a/lib/RT/Model/CustomFieldValue.pm
+++ b/lib/RT/Model/CustomFieldValue.pm
@@ -91,7 +91,7 @@ sub create {
? $args{'custom_field'}->id
: $args{'custom_field'};
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
$cf->load($cf_id);
unless ( $cf->id ) {
return ( 0, _( "Couldn't load Custom Field #%1", $cf_id ) );
diff --git a/lib/RT/Model/CustomFieldValueCollection/Groups.pm b/lib/RT/Model/CustomFieldValueCollection/Groups.pm
index e0c1d82..758ae32 100644
--- a/lib/RT/Model/CustomFieldValueCollection/Groups.pm
+++ b/lib/RT/Model/CustomFieldValueCollection/Groups.pm
@@ -62,7 +62,7 @@ sub external_values {
my @res;
my $i = 0;
- my $groups = RT::Model::GroupCollection->new( current_user => $self->current_user );
+ my $groups = RT::Model::GroupCollection->new;
$groups->limit_to_user_defined_groups;
$groups->order_by( { column => 'name' } );
while ( my $group = $groups->next ) {
diff --git a/lib/RT/Model/Group.pm b/lib/RT/Model/Group.pm
index 1942856..459c62b 100755
--- a/lib/RT/Model/Group.pm
+++ b/lib/RT/Model/Group.pm
@@ -136,7 +136,7 @@ Returns a user-readable description of what this group is for and what it's name
sub self_description {
my $self = shift;
if ( $self->domain eq 'ACLEquivalence' ) {
- my $user = RT::Model::Principal->new( current_user => $self->current_user );
+ my $user = RT::Model::Principal->new;
$user->load( $self->instance );
return _( "user %1", $user->object->name );
} elsif ( $self->domain eq 'UserDefined' ) {
@@ -144,7 +144,7 @@ sub self_description {
} elsif ( $self->domain eq 'RT::System-Role' ) {
return _( "system %1", $self->type );
} elsif ( $self->domain eq 'RT::Model::Queue-Role' ) {
- my $queue = RT::Model::Queue->new( current_user => $self->current_user );
+ my $queue = RT::Model::Queue->new;
$queue->load( $self->instance );
return _( "queue %1 %2", $queue->name, $self->type );
} elsif ( $self->domain eq 'RT::Model::Ticket-Role' ) {
@@ -325,7 +325,7 @@ sub _create {
# Groups deal with principal ids, rather than user ids.
# When creating this group, set up a principal id for it.
- my $principal = RT::Model::Principal->new( current_user => $self->current_user );
+ my $principal = RT::Model::Principal->new;
my ( $principal_id, $msg ) = $principal->create(
type => 'Group',
);
@@ -358,7 +358,7 @@ sub _create {
# in the ordinary case, this would fail badly because it would recurse and add all the members of this group as
# cached members. thankfully, we're creating the group now...so it has no members.
- my $cgm = RT::Model::CachedGroupMember->new( current_user => $self->current_user );
+ my $cgm = RT::Model::CachedGroupMember->new;
$cgm->create(
group => $self->principal,
member => $self->principal,
@@ -432,7 +432,7 @@ sub create_acl_equivalence {
# We use stashuser so we don't get transactions inside transactions
# and so we bypass all sorts of cruft we don't need
- my $aclstash = RT::Model::GroupMember->new( current_user => $self->current_user );
+ my $aclstash = RT::Model::GroupMember->new;
my ( $stash_id, $add_msg ) = $aclstash->_stash_user(
group => $self->principal,
member => $princ
@@ -565,7 +565,7 @@ sub set_disabled {
# a member of A, will delete C as a member of A without touching
# C as a member of B
- my $cached_submembers = RT::Model::CachedGroupMemberCollection->new( current_user => $self->current_user );
+ my $cached_submembers = RT::Model::CachedGroupMemberCollection->new;
$cached_submembers->limit(
column => 'immediate_parent',
diff --git a/lib/RT/Model/GroupMember.pm b/lib/RT/Model/GroupMember.pm
index bcacd87..c305c30 100755
--- a/lib/RT/Model/GroupMember.pm
+++ b/lib/RT/Model/GroupMember.pm
@@ -168,7 +168,7 @@ sub create {
return (undef);
}
- my $cached_member = RT::Model::CachedGroupMember->new( current_user => $self->current_user );
+ my $cached_member = RT::Model::CachedGroupMember->new;
my $cached_id = $cached_member->create(
member => $args{'member'}->principal,
group => $args{'group'}->principal,
@@ -178,7 +178,7 @@ sub create {
#and popuplate the CachedGroupMembers of all the groups that group is part of .
- my $cgm = RT::Model::CachedGroupMemberCollection->new( current_user => $self->current_user );
+ my $cgm = RT::Model::CachedGroupMemberCollection->new;
#When adding a member to a group, we need to go back
# find things which have the current group as a member.
@@ -186,7 +186,7 @@ sub create {
$cgm->limit_to_groups_with_member( $args{'group'}->id );
while ( my $parent_member = $cgm->next ) {
- my $other_cached_member = RT::Model::CachedGroupMember->new( current_user => $self->current_user );
+ my $other_cached_member = RT::Model::CachedGroupMember->new;
my $other_cached_id = $other_cached_member->create(
member => $args{'member'}->principal,
group => $parent_member->group,
@@ -252,7 +252,7 @@ sub _stash_user {
return (undef);
}
- my $cached_member = RT::Model::CachedGroupMember->new( current_user => $self->current_user );
+ my $cached_member = RT::Model::CachedGroupMember->new;
my $cached_id = $cached_member->create(
member => $args{'member'},
group => $args{'group'},
@@ -292,9 +292,7 @@ sub delete {
# a member of A, will delete C as a member of A without touching
# C as a member of B
- my $cached_submembers = RT::Model::CachedGroupMemberCollection->new(
- current_user => $self->current_user
- );
+ my $cached_submembers = RT::Model::CachedGroupMemberCollection->new;
$cached_submembers->limit(
column => 'member_id',
operator => '=',
diff --git a/lib/RT/Model/ObjectCustomField.pm b/lib/RT/Model/ObjectCustomField.pm
index a1ce9ce..ccba3f0 100644
--- a/lib/RT/Model/ObjectCustomField.pm
+++ b/lib/RT/Model/ObjectCustomField.pm
@@ -85,7 +85,7 @@ sub create {
#XXX: Where is ACL check for 'AssignCustomFields'?
- my $objectCFs = RT::Model::ObjectCustomFieldCollection->new( current_user => $self->current_user );
+ my $objectCFs = RT::Model::ObjectCustomFieldCollection->new;
$objectCFs->limit_to_object_id( $args{'object_id'} );
$objectCFs->limit_to_custom_field( $cf->id );
$objectCFs->limit_to_lookup_type( $cf->lookup_type );
@@ -116,7 +116,7 @@ sub create {
sub delete {
my $self = shift;
- my $objectCFs = RT::Model::ObjectCustomFieldCollection->new( current_user => $self->current_user );
+ my $objectCFs = RT::Model::ObjectCustomFieldCollection->new;
$objectCFs->limit_to_object_id( $self->object_id );
$objectCFs->limit_to_lookup_type( $self->custom_field_obj->lookup_type );
@@ -134,7 +134,7 @@ sub delete {
sub custom_field_obj {
my $self = shift;
my $id = shift || $self->custom_field->id;
- my $CF = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $CF = RT::Model::CustomField->new;
$CF->load($id);
return $CF;
}
diff --git a/lib/RT/Model/Principal.pm b/lib/RT/Model/Principal.pm
index 6413d24..96064ce 100755
--- a/lib/RT/Model/Principal.pm
+++ b/lib/RT/Model/Principal.pm
@@ -188,7 +188,7 @@ sub revoke_right {
$args{'object'} = RT->system;
}
- my $ace = RT::Model::ACE->new( current_user => $self->current_user );
+ my $ace = RT::Model::ACE->new;
$ace->load_by_cols(
right_name => $args{'right'},
object => $args{'object'},
diff --git a/lib/RT/Model/Queue.pm b/lib/RT/Model/Queue.pm
index 3883967..0c1e40f 100755
--- a/lib/RT/Model/Queue.pm
+++ b/lib/RT/Model/Queue.pm
@@ -391,7 +391,7 @@ Returns an RT::Model::TemplateCollection object of all of this queue's templates
sub templates {
my $self = shift;
- my $templates = RT::Model::TemplateCollection->new( current_user => $self->current_user );
+ my $templates = RT::Model::TemplateCollection->new;
if ( $self->current_user_has_right('ShowTemplate') ) {
$templates->limit_to_queue( $self->id );
@@ -447,7 +447,7 @@ Load the queue-specific custom field named name
sub custom_field {
my $self = shift;
my $name = shift;
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
$cf->load_by_name_and_queue( name => $name, queue => $self->id );
return ($cf);
}
@@ -463,7 +463,7 @@ queue-specific B<ticket> custom fields.
sub ticket_custom_fields {
my $self = shift;
- my $cfs = RT::Model::CustomFieldCollection->new( current_user => $self->current_user );
+ my $cfs = RT::Model::CustomFieldCollection->new;
if ( $self->current_user_has_right('SeeQueue') ) {
$cfs->limit_to_global_or_object_id( $self->id );
$cfs->limit_to_lookup_type('RT::Model::Queue-RT::Model::Ticket');
@@ -483,7 +483,7 @@ queue-specific B<transaction> custom fields.
sub ticket_transaction_custom_fields {
my $self = shift;
- my $cfs = RT::Model::CustomFieldCollection->new( current_user => $self->current_user );
+ my $cfs = RT::Model::CustomFieldCollection->new;
if ( $self->current_user_has_right('SeeQueue') ) {
$cfs->limit_to_global_or_object_id( $self->id );
$cfs->limit_to_lookup_type('RT::Model::Queue-RT::Model::Ticket-RT::Model::Transaction');
@@ -505,7 +505,7 @@ If the user doesn't have "ShowQueue" permission, returns an empty group
sub role_group {
my $self = shift;
my $role = shift;
- my $group = RT::Model::Group->new( current_user => $self->current_user );
+ my $group = RT::Model::Group->new;
if ( $self->current_user_has_right('SeeQueue') ) {
$group->load_role( type => $role, object => $self );
}
diff --git a/lib/RT/Model/ScripAction.pm b/lib/RT/Model/ScripAction.pm
index d69800f..6ae2893 100755
--- a/lib/RT/Model/ScripAction.pm
+++ b/lib/RT/Model/ScripAction.pm
@@ -176,13 +176,13 @@ sub template_obj {
my $self = shift;
return undef unless $self->{template};
if ( !$self->{'template_obj'} ) {
- $self->{'template_obj'} = RT::Model::Template->new( current_user => $self->current_user );
+ $self->{'template_obj'} = RT::Model::Template->new;
$self->{'template_obj'}->load_by_id( $self->{'template'} );
if ( ( $self->{'template_obj'}->__value('queue') == 0 )
&& $self->{'_ticket_obj'} )
{
- my $tmptemplate = RT::Model::Template->new( current_user => $self->current_user );
+ my $tmptemplate = RT::Model::Template->new;
my ( $ok, $err ) = $tmptemplate->load_queue_template(
queue => $self->{'_ticket_obj'}->queue->id,
name => $self->{'template_obj'}->name
diff --git a/lib/RT/Model/Template.pm b/lib/RT/Model/Template.pm
index 9ee7006..2a5b048 100755
--- a/lib/RT/Model/Template.pm
+++ b/lib/RT/Model/Template.pm
@@ -465,7 +465,7 @@ sub check_create_rights {
right => $right,
);
} else {
- my $queue = RT::Model::Queue->new( current_user => $self->current_user );
+ my $queue = RT::Model::Queue->new;
$queue->load( $args{'queue'} );
unless ( $queue->id ) {
Jifty->log->error(
@@ -518,7 +518,7 @@ sub check_delete_rights {
sub queue_obj {
require Carp; Carp::confess("deprecated");
my $self = shift;
- my $q = RT::Model::Queue->new( current_user => $self->current_user );
+ my $q = RT::Model::Queue->new;
$q->load( $self->__value('queue') );
return $q;
}
diff --git a/lib/RT/Model/Ticket.pm b/lib/RT/Model/Ticket.pm
index 998ce7c..99890d7 100755
--- a/lib/RT/Model/Ticket.pm
+++ b/lib/RT/Model/Ticket.pm
@@ -481,7 +481,7 @@ sub create {
#If we've been handed something else, try to load the user.
elsif ( $args{'owner'} ) {
- $owner = RT::Model::User->new( current_user => $self->current_user );
+ $owner = RT::Model::User->new;
$owner->load( $args{'owner'} );
unless ( $owner->id ) {
push @non_fatal_errors, _("Owner could not be set.") . " " . _( "User '%1' could not be found.", $args{'owner'} );
@@ -505,7 +505,7 @@ sub create {
#If we haven't been handed a valid owner, make it nobody.
unless ( defined($owner) && $owner->id ) {
- $owner = RT::Model::User->new( current_user => $self->current_user );
+ $owner = RT::Model::User->new;
$owner->load( RT->nobody->id );
}
@@ -1079,7 +1079,7 @@ sub validate_queue {
return (1);
}
- my $queue_obj = RT::Model::Queue->new( current_user => $self->current_user );
+ my $queue_obj = RT::Model::Queue->new;
my $id = $queue_obj->load($value);
if ($meta->{for} eq 'create') {
@@ -1125,7 +1125,7 @@ sub set_queue {
return ( 0, _("Permission Denied") );
}
- my $Newqueue_obj = RT::Model::Queue->new( current_user => $self->current_user );
+ my $Newqueue_obj = RT::Model::Queue->new;
$Newqueue_obj->load($NewQueue);
unless ( $Newqueue_obj->id() ) {
@@ -1462,11 +1462,11 @@ sub _links {
my $type = shift || "";
unless ( $self->{"$field$type"} ) {
- $self->{"$field$type"} = RT::Model::LinkCollection->new( current_user => $self->current_user );
+ $self->{"$field$type"} = RT::Model::LinkCollection->new;
if ( $self->current_user_has_right('ShowTicket') ) {
# Maybe this ticket is a merged ticket
- my $Tickets = RT::Model::TicketCollection->new( current_user => $self->current_user );
+ my $Tickets = RT::Model::TicketCollection->new;
# at least to myself
$self->{"$field$type"}->limit(
@@ -1797,7 +1797,7 @@ sub merge_into {
}
# update all the links that point to that old ticket
- my $old_links_to = RT::Model::LinkCollection->new( current_user => $self->current_user );
+ my $old_links_to = RT::Model::LinkCollection->new;
$old_links_to->limit( column => 'target', value => $self->uri );
my %old_seen;
@@ -1826,7 +1826,7 @@ sub merge_into {
}
- my $old_links_from = RT::Model::LinkCollection->new( current_user => $self->current_user );
+ my $old_links_from = RT::Model::LinkCollection->new;
$old_links_from->limit( column => 'base', value => $self->uri );
while ( my $link = $old_links_from->next ) {
@@ -1884,7 +1884,7 @@ sub merge_into {
}
#find all of the tickets that were merged into this ticket.
- my $old_mergees = RT::Model::TicketCollection->new( current_user => $self->current_user );
+ my $old_mergees = RT::Model::TicketCollection->new;
$old_mergees->limit(
column => 'effective_id',
operator => '=',
@@ -1917,7 +1917,7 @@ Returns list of tickets' ids that's been merged into this ticket.
sub merged {
my $self = shift;
- my $mergees = RT::Model::TicketCollection->new( current_user => $self->current_user );
+ my $mergees = RT::Model::TicketCollection->new;
$mergees->limit(
column => 'effective_id',
operator => '=',
@@ -1947,7 +1947,7 @@ sub owner_obj {
#get deep recursion. if we need ACLs here, we need
#an equiv without ACLs
- my $owner = RT::Model::User->new( current_user => $self->current_user );
+ my $owner = RT::Model::User->new;
$owner->load( $self->__value('owner') );
#Return the owner object
@@ -1992,7 +1992,7 @@ sub set_owner {
my $old_owner_obj = $self->owner;
- my $new_owner_obj = RT::Model::User->new( current_user => $self->current_user );
+ my $new_owner_obj = RT::Model::User->new;
$new_owner_obj->load($NewOwner);
unless ( $new_owner_obj->id ) {
Jifty->handle->rollback();
@@ -2613,7 +2613,7 @@ sub reminders {
sub transactions {
my $self = shift;
- my $transactions = RT::Model::TransactionCollection->new( current_user => $self->current_user );
+ my $transactions = RT::Model::TransactionCollection->new;
#If the user has no rights, return an empty object
if ( $self->current_user_has_right('ShowTicket') ) {
@@ -2671,14 +2671,14 @@ sub custom_field_values {
return $self->SUPER::custom_field_values($field)
if !$field || $field =~ /^\d+$/;
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
$cf->load_by_name_and_queue( name => $field, queue => $self->queue );
unless ( $cf->id ) {
$cf->load_by_name_and_queue( name => $field, queue => 0 );
}
# If we didn't find a valid cfid, give up.
- return RT::Model::ObjectCustomFieldValueCollection->new( current_user => $self->current_user )
+ return RT::Model::ObjectCustomFieldValueCollection->new
unless $cf->id;
return $self->SUPER::custom_field_values( $cf->id );
diff --git a/lib/RT/Model/TicketCollection.pm b/lib/RT/Model/TicketCollection.pm
index 8962cd3..047e05c 100755
--- a/lib/RT/Model/TicketCollection.pm
+++ b/lib/RT/Model/TicketCollection.pm
@@ -832,7 +832,7 @@ sub _watcher_limit {
# search by id and name at the same time, this is workaround
# to preserve backward compatibility
if ( lc $field eq 'owner' && !$rest{subkey} && $op =~ /^!?=$/ ) {
- my $o = RT::Model::User->new( current_user => $self->current_user );
+ my $o = RT::Model::User->new;
$o->load($value);
$self->_sql_limit(
column => 'owner',
@@ -875,7 +875,7 @@ sub _watcher_limit {
# "X = 'Y'" matches more then one user so we try to fetch two records and
# do the right thing when there is only one exist and semi-working solution
# otherwise.
- my $users_obj = RT::Model::UserCollection->new( current_user => $self->current_user );
+ my $users_obj = RT::Model::UserCollection->new;
$users_obj->limit(
column => $rest{subkey},
operator => $op,
@@ -1225,7 +1225,7 @@ sub _custom_field_decipher {
my $cf;
if ($queue) {
- my $q = RT::Model::Queue->new( current_user => $self->current_user );
+ my $q = RT::Model::Queue->new;
$q->load($queue);
if ( $q->id ) {
@@ -1240,7 +1240,7 @@ sub _custom_field_decipher {
} else {
$queue = '';
my $cfs =
- RT::Model::CustomFieldCollection->new( current_user => $self->current_user );
+ RT::Model::CustomFieldCollection->new;
$cfs->limit( column => 'name', value => $field );
$cfs->limit_to_lookup_type('RT::Model::Queue-RT::Model::Ticket');
@@ -1712,7 +1712,7 @@ sub limit_queue {
#TODO value should also take queue objects
if ( defined $args{'value'} && $args{'value'} !~ /^\d+$/ ) {
- my $queue = RT::Model::Queue->new( current_user => $self->current_user );
+ my $queue = RT::Model::Queue->new;
$queue->load( $args{'value'} );
$args{'value'} = $queue->id;
}
diff --git a/lib/RT/Model/Transaction.pm b/lib/RT/Model/Transaction.pm
index 2c77b31..7490e08 100755
--- a/lib/RT/Model/Transaction.pm
+++ b/lib/RT/Model/Transaction.pm
@@ -463,7 +463,7 @@ sub message {
unless ( defined $self->{'message'} ) {
- $self->{'message'} = RT::Model::AttachmentCollection->new( current_user => $self->current_user );
+ $self->{'message'} = RT::Model::AttachmentCollection->new;
$self->{'message'}->limit(
column => 'transaction_id',
value => $self->id
@@ -662,7 +662,7 @@ sub attachments {
return $self->{'attachments'};
}
- $self->{'attachments'} = RT::Model::AttachmentCollection->new( current_user => $self->current_user );
+ $self->{'attachments'} = RT::Model::AttachmentCollection->new;
unless ( $self->current_user_can_see ) {
$self->{'attachments'}->limit( column => 'id', value => '0' );
@@ -698,7 +698,7 @@ sub _attach {
return ( 0, _( "%1: no attachment specified", $self ) );
}
- my $Attachment = RT::Model::Attachment->new( current_user => $self->current_user );
+ my $Attachment = RT::Model::Attachment->new;
my ( $id, $msg ) = $Attachment->create(
transaction_id => $self->id,
attachment => $mime_object
@@ -800,7 +800,7 @@ sub brief_description {
my $field = _('custom_field');
if ( $self->field ) {
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
$cf->load( $self->field );
$field = $cf->name();
}
@@ -824,34 +824,34 @@ sub brief_description {
},
force => sub {
my $self = shift;
- my $Old = RT::Model::User->new( current_user => $self->current_user );
+ my $Old = RT::Model::User->new;
$Old->load( $self->old_value );
- my $New = RT::Model::User->new( current_user => $self->current_user );
+ my $New = RT::Model::User->new;
$New->load( $self->new_value );
return _( "Owner forcibly changed from %1 to %2", $Old->name, $New->name );
},
steal => sub {
my $self = shift;
- my $Old = RT::Model::User->new( current_user => $self->current_user );
+ my $Old = RT::Model::User->new;
$Old->load( $self->old_value );
return _( "Stolen from %1", $Old->name );
},
give => sub {
my $self = shift;
- my $New = RT::Model::User->new( current_user => $self->current_user );
+ my $New = RT::Model::User->new;
$New->load( $self->new_value );
return _( "Given to %1", $New->name );
},
add_watcher => sub {
my $self = shift;
- my $principal = RT::Model::Principal->new( current_user => $self->current_user );
+ my $principal = RT::Model::Principal->new;
$principal->load( $self->new_value );
return _( "%1 %2 added", $self->field, $principal->object->name );
},
del_watcher => sub {
my $self = shift;
- my $principal = RT::Model::Principal->new( current_user => $self->current_user );
+ my $principal = RT::Model::Principal->new;
$principal->load( $self->old_value );
return _( "%1 %2 deleted", $self->field, $principal->object->name );
},
@@ -931,9 +931,9 @@ sub brief_description {
if ( $self->field eq 'password' ) {
return _('password changed');
} elsif ( $self->field eq 'queue' ) {
- my $q1 = RT::Model::Queue->new( current_user => $self->current_user );
+ my $q1 = RT::Model::Queue->new;
$q1->load( $self->old_value );
- my $q2 = RT::Model::Queue->new( current_user => $self->current_user );
+ my $q2 = RT::Model::Queue->new;
$q2->load( $self->new_value );
return _( "%1 changed from %2 to %3", $self->field, $q1->name, $q2->name );
}
@@ -961,20 +961,20 @@ sub brief_description {
},
add_reminder => sub {
my $self = shift;
- my $ticket = RT::Model::Ticket->new( current_user => $self->current_user );
+ my $ticket = RT::Model::Ticket->new;
$ticket->load( $self->new_value );
return _( "Reminder '%1' added", $ticket->subject );
},
open_reminder => sub {
my $self = shift;
- my $ticket = RT::Model::Ticket->new( current_user => $self->current_user );
+ my $ticket = RT::Model::Ticket->new;
$ticket->load( $self->new_value );
return _( "Reminder '%1' reopened", $ticket->subject );
},
resolve_reminder => sub {
my $self = shift;
- my $ticket = RT::Model::Ticket->new( current_user => $self->current_user );
+ my $ticket = RT::Model::Ticket->new;
$ticket->load( $self->new_value );
return _( "Reminder '%1' completed", $ticket->subject );
@@ -1058,7 +1058,7 @@ sub current_user_can_see {
# Make sure the user can see the custom field before showing that it changed
elsif ( $type eq 'custom_field' and my $cf_id = $self->__value('field') ) {
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
$cf->load($cf_id);
return 0 unless $cf->current_user_has_right('SeeCustomField');
}
@@ -1185,7 +1185,7 @@ sub custom_field_values {
# XXX: $field could be undef when we want fetch values for all CFs
# do we want to cover this situation somehow here?
unless ( defined $field && $field =~ /^\d+$/o ) {
- my $CFs = RT::Model::CustomFieldCollection->new( current_user => $self->current_user );
+ my $CFs = RT::Model::CustomFieldCollection->new;
$CFs->limit( column => 'name', value => $field );
$CFs->limit_to_lookup_type( $self->custom_field_lookup_type );
$CFs->limit_to_global_or_object_id( $self->object->queue->id );
diff --git a/lib/RT/Model/User.pm b/lib/RT/Model/User.pm
index cfc305a..95f9b66 100755
--- a/lib/RT/Model/User.pm
+++ b/lib/RT/Model/User.pm
@@ -217,7 +217,7 @@ sub create {
# Groups deal with principal ids, rather than user ids.
# When creating this user, set up a principal id for it.
- my $principal = RT::Model::Principal->new( current_user => $self->current_user );
+ my $principal = RT::Model::Principal->new;
my $principal_id = $principal->create(
type => 'User',
disabled => $args{'disabled'},
@@ -244,7 +244,7 @@ sub create {
return ( 0, _('Could not create user') );
}
- my $aclstash = RT::Model::Group->new( current_user => $self->current_user );
+ my $aclstash = RT::Model::Group->new;
my $stash_id = $aclstash->create_acl_equivalence($principal);
unless ($stash_id) {
@@ -253,7 +253,7 @@ sub create {
return ( 0, _('Could not create user') );
}
- my $everyone = RT::Model::Group->new( current_user => $self->current_user );
+ my $everyone = RT::Model::Group->new;
$everyone->load_system_internal('Everyone');
unless ( $everyone->id ) {
Jifty->log->fatal("Could not load Everyone group on user creation.");
@@ -269,7 +269,7 @@ sub create {
return ( 0, _('Could not create user') );
}
- my $access_class = RT::Model::Group->new( current_user => $self->current_user );
+ my $access_class = RT::Model::Group->new;
if ($privileged) {
$access_class->load_system_internal('privileged');
} else {
@@ -324,7 +324,7 @@ sub set_privileged {
{
return ( 0, _('No permission to create users') );
}
- my $priv = RT::Model::Group->new( current_user => $self->current_user );
+ my $priv = RT::Model::Group->new;
$priv->load_system_internal('privileged');
unless ( $priv->id ) {
@@ -332,7 +332,7 @@ sub set_privileged {
return ( 0, _("Failed to find 'privileged' users pseudogroup.") );
}
- my $unpriv = RT::Model::Group->new( current_user => $self->current_user );
+ my $unpriv = RT::Model::Group->new;
$unpriv->load_system_internal('Unprivileged');
unless ( $unpriv->id ) {
Jifty->log->fatal("Could not find unprivileged pseudogroup");
@@ -393,7 +393,7 @@ Returns true if this user is privileged. Returns undef otherwise.
sub privileged {
my $self = shift;
- my $priv = RT::Model::Group->new( current_user => $self->current_user );
+ my $priv = RT::Model::Group->new;
$priv->load_system_internal('privileged');
if ( $priv->has_member( principal => $self->principal ) ) {
return (1);
@@ -450,7 +450,7 @@ sub _bootstrap_create {
return ( 0, 'Could not create user' ); #never loc this
}
- my $aclstash = RT::Model::Group->new( current_user => $self->current_user );
+ my $aclstash = RT::Model::Group->new;
my $stash_id = $aclstash->create_acl_equivalence($principal);
@@ -899,7 +899,7 @@ sub has_group_right {
);
if ( defined $args{'group'} ) {
- $args{'group_obj'} = RT::Model::Group->new( current_user => $self->current_user );
+ $args{'group_obj'} = RT::Model::Group->new;
$args{'group_obj'}->load( $args{'group'} );
}
@@ -927,7 +927,7 @@ user is a member.
sub own_groups {
my $self = shift;
- my $groups = RT::Model::GroupCollection->new( current_user => $self->current_user );
+ my $groups = RT::Model::GroupCollection->new;
$groups->limit_to_user_defined_groups;
$groups->with_member(
principal => $self->id,
@@ -1044,7 +1044,7 @@ sub preferences {
my $name = _prefname(shift);
my $default = shift;
- my $attr = RT::Model::Attribute->new( current_user => $self->current_user );
+ my $attr = RT::Model::Attribute->new;
$attr->load_by_name_and_object( object => $self, name => $name );
my $content = $attr->id ? $attr->content : undef;
@@ -1077,7 +1077,7 @@ sub set_preferences {
return ( 0, _("No permission to set preferences") )
unless $self->current_user_can_modify('Preferences');
- my $attr = RT::Model::Attribute->new( current_user => $self->current_user );
+ my $attr = RT::Model::Attribute->new;
$attr->load_by_name_and_object( object => $self, name => $name );
if ( $attr->id ) {
return $attr->set_content($value);
@@ -1101,7 +1101,7 @@ sub watched_queues {
my $self = shift;
my @roles = @_ || ( 'cc', 'admin_cc' );
- my $watched_queues = RT::Model::QueueCollection->new( current_user => $self->current_user );
+ my $watched_queues = RT::Model::QueueCollection->new;
my $group_alias = $watched_queues->join(
alias1 => 'main',
diff --git a/lib/RT/Model/UserCollection.pm b/lib/RT/Model/UserCollection.pm
index 7e3c06c..59f2765 100755
--- a/lib/RT/Model/UserCollection.pm
+++ b/lib/RT/Model/UserCollection.pm
@@ -126,7 +126,7 @@ Limits to users who can be made members of ACLs and groups
sub limit_to_privileged {
my $self = shift;
- my $priv = RT::Model::Group->new( current_user => $self->current_user );
+ my $priv = RT::Model::Group->new;
$priv->load_system_internal('privileged');
unless ( $priv->id ) {
Jifty->log->fatal("Couldn't find a privileged users group");
diff --git a/lib/RT/Record.pm b/lib/RT/Record.pm
index d383424..7aabac3 100755
--- a/lib/RT/Record.pm
+++ b/lib/RT/Record.pm
@@ -143,7 +143,7 @@ sub attributes {
my $self = shift;
unless ( $self->{'attributes'} ) {
- $self->{'attributes'} = RT::Model::AttributeCollection->new( current_user => $self->current_user );
+ $self->{'attributes'} = RT::Model::AttributeCollection->new;
$self->{'attributes'}->limit_to_object($self);
}
return ( $self->{'attributes'} );
@@ -165,7 +165,7 @@ sub add_attribute {
@_
);
- my $attr = RT::Model::Attribute->new( current_user => $self->current_user );
+ my $attr = RT::Model::Attribute->new;
my ( $id, $msg ) = $attr->create(
object => $self,
name => $args{'name'},
@@ -392,7 +392,7 @@ object
sub last_updated_by_obj {
my $self = shift;
unless ( exists $self->{last_updated_by_obj} ) {
- $self->{'last_updated_by_obj'} = RT::Model::User->new( current_user => $self->current_user );
+ $self->{'last_updated_by_obj'} = RT::Model::User->new;
$self->{'last_updated_by_obj'}->load( $self->last_updated_by );
}
return $self->{'last_updated_by_obj'};
@@ -769,7 +769,7 @@ RT::Model::Queue->status_schema->active
sub unresolved_dependencies {
my $self = shift;
- my $deps = RT::Model::TicketCollection->new( current_user => $self->current_user );
+ my $deps = RT::Model::TicketCollection->new;
my @live_statuses = RT::Model::Queue->status_schema->valid('initial', 'active');
foreach my $status (@live_statuses) {
@@ -899,7 +899,7 @@ sub _links {
my $type = shift || "";
unless ( $self->{"$field$type"} ) {
- $self->{"$field$type"} = RT::Model::LinkCollection->new( current_user => $self->current_user );
+ $self->{"$field$type"} = RT::Model::LinkCollection->new;
# at least to myself
$self->{"$field$type"}->limit(
@@ -999,7 +999,7 @@ sub _add_link {
# {{{ Check if the link already exists - we don't want duplicates
use RT::Model::Link;
- my $old_link = RT::Model::Link->new( current_user => $self->current_user );
+ my $old_link = RT::Model::Link->new;
$old_link->load_by_params(
base => $args{'base'},
type => $args{'type'},
@@ -1013,7 +1013,7 @@ sub _add_link {
# }}}
# Storing the link in the DB.
- my $link = RT::Model::Link->new( current_user => $self->current_user );
+ my $link = RT::Model::Link->new;
my ( $linkid, $linkmsg ) = $link->create(
target => $args{target},
base => $args{base},
@@ -1080,7 +1080,7 @@ sub _delete_link {
return ( 0, _('Either base or target must be specified') );
}
- my $link = RT::Model::Link->new( current_user => $self->current_user );
+ my $link = RT::Model::Link->new;
Jifty->log->debug( "Trying to load link: " . $args{'base'} . " " . $args{'type'} . " " . $args{'target'} );
$link->load_by_params(
@@ -1154,7 +1154,7 @@ sub _new_transaction {
$new_ref = $new_ref->id if ref($new_ref);
}
- my $trans = RT::Model::Transaction->new( current_user => $self->current_user );
+ my $trans = RT::Model::Transaction->new;
my ( $transaction, $msg ) = $trans->create(
object_id => $self->id,
object_type => ref($self),
@@ -1200,7 +1200,7 @@ sub transactions {
my $self = shift;
use RT::Model::TransactionCollection;
- my $transactions = RT::Model::TransactionCollection->new( current_user => $self->current_user );
+ my $transactions = RT::Model::TransactionCollection->new;
#If the user has no rights, return an empty object
$transactions->limit(
@@ -1219,7 +1219,7 @@ sub transactions {
sub custom_fields {
my $self = shift;
- my $cfs = RT::Model::CustomFieldCollection->new( current_user => $self->current_user );
+ my $cfs = RT::Model::CustomFieldCollection->new;
# XXX handle multiple types properly
$cfs->limit_to_lookup_type( $self->custom_field_lookup_type );
@@ -1393,7 +1393,7 @@ sub _add_custom_field_value {
return ( 0, _( "Could not add new custom field value: %1", $value_msg ) );
}
- my $new_value = RT::Model::ObjectCustomFieldValue->new( current_user => $self->current_user );
+ my $new_value = RT::Model::ObjectCustomFieldValue->new;
$new_value->load($new_value_id);
# now that adding the new value was successful, delete the old one
@@ -1535,13 +1535,13 @@ sub custom_field_values {
# we were asked to search on a custom field we couldn't find
unless ( $cf->id ) {
Jifty->log->warn("Couldn't load custom field by '$field' identifier");
- return RT::Model::ObjectCustomFieldValueCollection->new( current_user => $self->current_user );
+ return RT::Model::ObjectCustomFieldValueCollection->new;
}
return ( $cf->values_for_object($self) );
}
# we're not limiting to a specific custom field;
- my $ocfs = RT::Model::ObjectCustomFieldValueCollection->new( current_user => $self->current_user );
+ my $ocfs = RT::Model::ObjectCustomFieldValueCollection->new;
$ocfs->limit_to_object($self);
return $ocfs;
}
@@ -1561,18 +1561,18 @@ sub load_custom_field_by_identifier {
unless ( defined $field ) {
Carp::confess;
}
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
if ( UNIVERSAL::isa( $field, "RT::Model::CustomField" ) ) {
$cf->load_by_id( $field->id );
} elsif ( $field =~ /^\d+$/ ) {
- $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ $cf = RT::Model::CustomField->new;
$cf->load_by_id($field);
} else {
my $cfs = $self->custom_fields();
$cfs->limit( column => 'name', value => $field, case_sensitive => 0 );
- $cf = $cfs->first || RT::Model::CustomField->new( current_user => $self->current_user );
+ $cf = $cfs->first || RT::Model::CustomField->new;
}
return $cf;
}
diff --git a/lib/RT/Report/Tickets.pm b/lib/RT/Report/Tickets.pm
index 304d929..06ae487 100644
--- a/lib/RT/Report/Tickets.pm
+++ b/lib/RT/Report/Tickets.pm
@@ -89,9 +89,9 @@ sub groupings {
}
if ($queues) {
- my $CustomFields = RT::Model::CustomFieldCollection->new( current_user => $self->current_user );
+ my $CustomFields = RT::Model::CustomFieldCollection->new;
foreach my $id ( keys %$queues ) {
- my $queue = RT::Model::Queue->new( current_user => $self->current_user );
+ my $queue = RT::Model::Queue->new;
$queue->load($id);
unless ( $queue->id ) {
@@ -116,7 +116,7 @@ sub label {
if ( $field =~ /^(?:CF|CustomField)\.{(.*)}$/ ) {
my $cf = $1;
return _( "Custom field '%1'", $cf ) if $cf =~ /\D/;
- my $obj = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $obj = RT::Model::CustomField->new;
$obj->load($cf);
return _( "Custom field '%1'", $obj->name );
}
@@ -181,7 +181,7 @@ sub _field_to_function {
}
} elsif ( $field =~ /^(?:cf|custom_field)\.{(.*)}$/ ) { #XXX: use CFDecipher method
my $cf_name = $1;
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
$cf->load($cf_name);
unless ( $cf->id ) {
Jifty->log->error("Couldn't load CustomField #$cf_name");
diff --git a/lib/RT/Rule.pm b/lib/RT/Rule.pm
index 419b353..c244b2e 100644
--- a/lib/RT/Rule.pm
+++ b/lib/RT/Rule.pm
@@ -100,13 +100,13 @@ sub run_scrip_action {
sub get_scrip_action {
my ($self, $scrip_action, $template, %args) = @_;
- my $ScripAction = RT::Model::ScripAction->new( current_user => $self->current_user);
+ my $ScripAction = RT::Model::ScripAction->new;
$ScripAction->load($scrip_action) or die ;
unless (ref($template)) {
# XXX: load per-queue template
# $template->LoadQueueTemplate( Queue => ..., ) || $template->LoadGlobalTemplate(...)
- my $t = RT::Model::Template->new( current_user => $self->current_user);
+ my $t = RT::Model::Template->new;
$t->load($template) or Carp::confess "Can't load template '$template'";
$template = $t;
}
diff --git a/lib/RT/SavedSearches.pm b/lib/RT/SavedSearches.pm
index f59621d..6e8ffb5 100644
--- a/lib/RT/SavedSearches.pm
+++ b/lib/RT/SavedSearches.pm
@@ -167,7 +167,7 @@ sub _privacy_objects {
my $self = shift;
my $CurrentUser = $self->current_user;
- my $groups = RT::Model::GroupCollection->new( current_user => $self->current_user );
+ my $groups = RT::Model::GroupCollection->new;
$groups->limit_to_user_defined_groups;
$groups->with_member(
principal => $self->current_user->id,
diff --git a/lib/RT/ScripAction/CreateTickets.pm b/lib/RT/ScripAction/CreateTickets.pm
index 3774d42..06a7366 100755
--- a/lib/RT/ScripAction/CreateTickets.pm
+++ b/lib/RT/ScripAction/CreateTickets.pm
@@ -638,7 +638,7 @@ sub parse_lines {
}
}
- my $ticket_obj ||= RT::Model::Ticket->new( current_user => $self->current_user );
+ my $ticket_obj ||= RT::Model::Ticket->new;
my %args;
my %original_tags;
@@ -732,11 +732,11 @@ sub parse_lines {
if ( $orig_tag =~ /^custom_?field-?(\d+)$/i ) {
$ticketargs{ "cf_" . $1 } = $args{$tag};
} elsif ( $orig_tag =~ /^(?:custom_?field|cf)-?(.*)$/i ) {
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
$cf->load_by_name( name => $1, queue => $ticketargs{queue} );
$ticketargs{ "cf_" . $cf->id } = $args{$tag};
} elsif ($orig_tag) {
- my $cf = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf = RT::Model::CustomField->new;
$cf->load_by_name(
name => $orig_tag,
queue => $ticketargs{queue}
@@ -1060,7 +1060,7 @@ sub update_watchers {
} else {
# It doesn't look like an email address. Try to load it.
- my $user = RT::Model::User->new( current_user => $self->current_user );
+ my $user = RT::Model::User->new;
$user->load($_);
if ( $user->id ) {
push @new, $user->email;
@@ -1106,7 +1106,7 @@ sub update_custom_fields {
next unless $arg =~ /^custom_?field-(\d+)$/;
my $cf = $1;
- my $cf_obj = RT::Model::CustomField->new( current_user => $self->current_user );
+ my $cf_obj = RT::Model::CustomField->new;
$cf_obj->load_by_id($cf);
my @values;
diff --git a/lib/RT/SharedSetting.pm b/lib/RT/SharedSetting.pm
index 29cdfc5..312b557 100644
--- a/lib/RT/SharedSetting.pm
+++ b/lib/RT/SharedSetting.pm
@@ -138,7 +138,7 @@ sub load_by_id {
my $self = shift;
my $id = shift;
- my $attr = RT::Model::Attribute->new( current_user => $self->current_user );
+ my $attr = RT::Model::Attribute->new;
my ( $ok, $msg ) = $attr->load_by_id($id);
if ( !$ok ) {
@@ -364,7 +364,7 @@ sub is_visible_to {
# If the setting is group-wide...
if ( $privacy =~ /^RT::Model::Group-(\d+)$/ ) {
- my $setting_group = RT::Model::Group->new( current_user => $self->current_user );
+ my $setting_group = RT::Model::Group->new;
$setting_group->load($1);
if ( $to =~ /-(\d+)$/ ) {
@@ -448,12 +448,12 @@ sub _load_privacy_object {
}
}
elsif ( $obj_type eq 'RT::Model::Group' ) {
- my $group = RT::Model::Group->new( current_user => $self->current_user );
+ my $group = RT::Model::Group->new;
$group->load($obj_id);
return $group;
}
elsif ( $obj_type eq 'RT::System' ) {
- return RT::System->new( current_user => $self->current_user );
+ return RT::System->new;
}
Jifty->log->error( "Tried to load a "
diff --git a/lib/RT/Shredder/Attachment.pm b/lib/RT/Shredder/Attachment.pm
index 5468f4d..087e8d2 100644
--- a/lib/RT/Shredder/Attachment.pm
+++ b/lib/RT/Shredder/Attachment.pm
@@ -68,7 +68,7 @@ sub __depends_on {
my $list = [];
# Nested attachments
- my $objs = RT::Model::AttachmentCollection->new( current_user => $self->current_user );
+ my $objs = RT::Model::AttachmentCollection->new;
$objs->limit(
column => 'Parent',
operator => '=',
diff --git a/lib/RT/Shredder/CachedGroupMember.pm b/lib/RT/Shredder/CachedGroupMember.pm
index 4aabe66..f8d35ee 100644
--- a/lib/RT/Shredder/CachedGroupMember.pm
+++ b/lib/RT/Shredder/CachedGroupMember.pm
@@ -68,7 +68,7 @@ sub __depends_on {
my $list = [];
# deep memebership
- my $objs = RT::Model::CachedGroupMemberCollection->new( current_user => $self->current_user );
+ my $objs = RT::Model::CachedGroupMemberCollection->new;
$objs->limit( column => 'via', value => $self->id );
$objs->limit( column => 'id', operator => '!=', value => $self->id );
push( @$list, $objs );
diff --git a/lib/RT/Shredder/CustomField.pm b/lib/RT/Shredder/CustomField.pm
index 9f12d4d..98ba73c 100644
--- a/lib/RT/Shredder/CustomField.pm
+++ b/lib/RT/Shredder/CustomField.pm
@@ -73,7 +73,7 @@ sub __depends_on {
push( @$list, $self->values );
# Ticket custom field values
- my $objs = RT::Model::ObjectCustomFieldValueCollection->new( current_user => $self->current_user );
+ my $objs = RT::Model::ObjectCustomFieldValueCollection->new;
$objs->limit_to_custom_field( $self->id );
push( @$list, $objs );
diff --git a/lib/RT/Shredder/Group.pm b/lib/RT/Shredder/Group.pm
index 95f6501..b0dc109 100644
--- a/lib/RT/Shredder/Group.pm
+++ b/lib/RT/Shredder/Group.pm
@@ -72,7 +72,7 @@ sub __depends_on {
# delete user entry after ACL equiv group
# in other case we will get deep recursion
- my $objs = RT::Model::User->new( current_user => $self->current_user );
+ my $objs = RT::Model::User->new;
$objs->load( $self->instance );
$deps->_push_dependency(
base_object => $self,
@@ -91,12 +91,12 @@ sub __depends_on {
);
# Group members records
- my $objs = RT::Model::GroupMemberCollection->new( current_user => $self->current_user );
+ my $objs = RT::Model::GroupMemberCollection->new;
$objs->limit_to_members_of_group( $self->principal_id );
push( @$list, $objs );
# Group member records group belongs to
- $objs = RT::Model::GroupMemberCollection->new( current_user => $self->current_user );
+ $objs = RT::Model::GroupMemberCollection->new;
$objs->limit(
value => $self->principal_id,
column => 'member_id',
@@ -109,7 +109,7 @@ sub __depends_on {
push( @$list, $self->members( recursively => 1 ) );
# Cached group member records group belongs to
- $objs = RT::Model::GroupMemberCollection->new( current_user => $self->current_user );
+ $objs = RT::Model::GroupMemberCollection->new;
$objs->limit(
value => $self->principal_id,
column => 'member_id',
diff --git a/lib/RT/Shredder/GroupMember.pm b/lib/RT/Shredder/GroupMember.pm
index 614d252..f2471a3 100644
--- a/lib/RT/Shredder/GroupMember.pm
+++ b/lib/RT/Shredder/GroupMember.pm
@@ -69,7 +69,7 @@ sub __depends_on {
my $deps = $args{'dependencies'};
my $list = [];
- my $objs = RT::Model::CachedGroupMemberCollection->new( current_user => $self->current_user );
+ my $objs = RT::Model::CachedGroupMemberCollection->new;
$objs->limit( column => 'member_id', value => $self->member_id );
$objs->limit( column => 'immediate_parent', value => $self->group_id );
push( @$list, $objs );
diff --git a/lib/RT/Shredder/Principal.pm b/lib/RT/Shredder/Principal.pm
index 7e53347..f082d0f 100644
--- a/lib/RT/Shredder/Principal.pm
+++ b/lib/RT/Shredder/Principal.pm
@@ -75,7 +75,7 @@ sub __depends_on {
}
# Access Control List
- my $objs = RT::Model::ACECollection->new( current_user => $self->current_user );
+ my $objs = RT::Model::ACECollection->new;
$objs->limit(
column => 'principal',
operator => '=',
diff --git a/lib/RT/Shredder/Queue.pm b/lib/RT/Shredder/Queue.pm
index 04d96e1..3a81d7c 100644
--- a/lib/RT/Shredder/Queue.pm
+++ b/lib/RT/Shredder/Queue.pm
@@ -68,13 +68,13 @@ sub __depends_on {
my $list = [];
# Tickets
- my $objs = RT::Model::TicketCollection->new( current_user => $self->current_user );
+ my $objs = RT::Model::TicketCollection->new;
$objs->{'allow_deleted_search'} = 1;
$objs->limit( column => 'queue', value => $self->id );
push( @$list, $objs );
# queue role groups( Cc, AdminCc )
- $objs = RT::Model::GroupCollection->new( current_user => $self->current_user );
+ $objs = RT::Model::GroupCollection->new;
$objs->limit( column => 'domain', value => 'RT::Model::Queue-Role' );
$objs->limit( column => 'instance', value => $self->id );
push( @$list, $objs );
@@ -84,7 +84,7 @@ sub __depends_on {
push( @$list, $objs );
# Custom Fields
- $objs = RT::Model::CustomFieldCollection->new( current_user => $self->current_user );
+ $objs = RT::Model::CustomFieldCollection->new;
$objs->limit_to_queue( $self->id );
push( @$list, $objs );
diff --git a/lib/RT/Shredder/Record.pm b/lib/RT/Shredder/Record.pm
index 6cd610b..099069f 100644
--- a/lib/RT/Shredder/Record.pm
+++ b/lib/RT/Shredder/Record.pm
@@ -133,7 +133,7 @@ sub __depends_on {
push( @$list, $objs );
# Transactions
- $objs = RT::Model::TransactionCollection->new( current_user => $self->current_user );
+ $objs = RT::Model::TransactionCollection->new;
$objs->limit( column => 'object_type', value => ref $self );
$objs->limit( column => 'object_id', value => $self->id );
push( @$list, $objs );
@@ -152,7 +152,7 @@ sub __depends_on {
}
# ACE records
- $objs = RT::Model::ACECollection->new( current_user => $self->current_user );
+ $objs = RT::Model::ACECollection->new;
$objs->limit_to_object($self);
push( @$list, $objs );
diff --git a/lib/RT/Shredder/Ticket.pm b/lib/RT/Shredder/Ticket.pm
index c3a8718..52eed92 100644
--- a/lib/RT/Shredder/Ticket.pm
+++ b/lib/RT/Shredder/Ticket.pm
@@ -68,14 +68,14 @@ sub __depends_on {
my $list = [];
# Tickets which were merged in
- my $objs = RT::Model::TicketCollection->new( current_user => $self->current_user );
+ my $objs = RT::Model::TicketCollection->new;
$objs->{'allow_deleted_search'} = 1;
$objs->limit( column => 'effective_id', value => $self->id );
$objs->limit( column => 'id', operator => '!=', value => $self->id );
push( @$list, $objs );
# Ticket role groups( Owner, Requestors, Cc, AdminCc )
- $objs = RT::Model::GroupCollection->new( current_user => $self->current_user );
+ $objs = RT::Model::GroupCollection->new;
$objs->limit( column => 'domain', value => 'RT::Model::Ticket-Role' );
$objs->limit( column => 'instance', value => $self->id );
push( @$list, $objs );
diff --git a/lib/RT/Shredder/User.pm b/lib/RT/Shredder/User.pm
index bd50234..9e1e168 100644
--- a/lib/RT/Shredder/User.pm
+++ b/lib/RT/Shredder/User.pm
@@ -95,13 +95,13 @@ sub __depends_on {
# ACL equivalence group
# don't use load_acl_equivalence cause it may not exists any more
- my $objs = RT::Model::GroupCollection->new( current_user => $self->current_user );
+ my $objs = RT::Model::GroupCollection->new;
$objs->limit( column => 'domain', value => 'ACLEquivalence' );
$objs->limit( column => 'instance', value => $self->id );
push( @$list, $objs );
# Cleanup user's membership
- $objs = RT::Model::GroupMemberCollection->new( current_user => $self->current_user );
+ $objs = RT::Model::GroupMemberCollection->new;
$objs->limit( column => 'member_id', value => $self->id );
push( @$list, $objs );
diff --git a/lib/RT/URI.pm b/lib/RT/URI.pm
index ff91831..591ac04 100755
--- a/lib/RT/URI.pm
+++ b/lib/RT/URI.pm
@@ -145,7 +145,7 @@ sub _get_resolver {
Jifty::Util->try_to_require($class);
if ( $class->can('new') ) {
- $self->{'resolver'} = $class->new( current_user => $self->current_user );
+ $self->{'resolver'} = $class->new;
} else {
$self->{'resolver'} = RT::URI::base->new;
}
diff --git a/lib/RT/URI/fsck_com_rt.pm b/lib/RT/URI/fsck_com_rt.pm
index 3cdb1a8..b8fef8b 100755
--- a/lib/RT/URI/fsck_com_rt.pm
+++ b/lib/RT/URI/fsck_com_rt.pm
@@ -110,7 +110,7 @@ sub parse_uri {
my $uri = shift;
if ( $uri =~ /^\d+$/ ) {
- my $ticket = RT::Model::Ticket->new( current_user => $self->current_user );
+ my $ticket = RT::Model::Ticket->new;
$ticket->load($uri);
$self->{'uri'} = $ticket->uri;
$self->{'object'} = $ticket;
commit 8d58e29babf92972da6f31ebc3ca3dbb5aa3c0ad
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Dec 3 01:07:25 2009 -0500
Reverse the conditional in canonicalize_resolved
diff --git a/lib/RT/Model/Ticket.pm b/lib/RT/Model/Ticket.pm
index 99890d7..774141a 100755
--- a/lib/RT/Model/Ticket.pm
+++ b/lib/RT/Model/Ticket.pm
@@ -883,7 +883,7 @@ sub canonicalize_resolved {
my $queue_obj = RT::Model::Queue->new;
$queue_obj->load($queue);
- if ( !$queue_obj->status_schema->is_inactive($other->{status}) ) {
+ if ($queue_obj->status_schema->is_inactive($other->{status})) {
return RT::DateTime->now;
}
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list