[Rt-commit] rt branch, 3.999-trunk, updated. 5e85b67ad5b5ab8a1a08e8c901f74844d116fa9e
sartak at bestpractical.com
sartak at bestpractical.com
Thu Dec 3 06:48:36 EST 2009
The branch, 3.999-trunk has been updated
via 5e85b67ad5b5ab8a1a08e8c901f74844d116fa9e (commit)
from efe5648425a75e43912994f4f82d9ef1888d1b60 (commit)
Summary of changes:
lib/RT/Action/CreateTicket.pm | 5 +----
lib/RT/Action/QueueBased.pm | 4 +---
lib/RT/Model/CustomField.pm | 6 ++----
lib/RT/Model/Group.pm | 3 +--
lib/RT/Model/Template.pm | 6 ++----
lib/RT/Model/TicketCollection.pm | 6 ++----
lib/RT/Model/Transaction.pm | 6 ++----
lib/RT/Report/Tickets.pm | 3 +--
lib/RT/View/Ticket/Links.pm | 4 +---
share/html/Admin/Queues/CustomField.html | 3 +--
share/html/Admin/Queues/Template.html | 3 +--
share/html/Admin/Queues/Templates.html | 3 +--
share/html/SelfService/Create.html | 3 +--
share/html/Ticket/Display.html | 3 +--
share/html/Tools/Reports/CreatedByDates.html | 4 +---
share/html/Tools/Reports/ResolvedByDates.html | 4 +---
share/html/Tools/Reports/ResolvedByOwner.html | 3 +--
17 files changed, 21 insertions(+), 48 deletions(-)
- Log -----------------------------------------------------------------
commit 5e85b67ad5b5ab8a1a08e8c901f74844d116fa9e
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Thu Dec 3 06:48:07 2009 -0500
More queue loading simplification
diff --git a/lib/RT/Action/CreateTicket.pm b/lib/RT/Action/CreateTicket.pm
index 27ea5a2..c2290f4 100644
--- a/lib/RT/Action/CreateTicket.pm
+++ b/lib/RT/Action/CreateTicket.pm
@@ -215,10 +215,7 @@ sub canonicalize_sign_using {
return $address if length $address;
- my $queue_id = $self->argument_value('queue');
- my $queue = RT::Model::Queue->new;
- $queue->load($queue_id);
-
+ my $queue = RT::Model::Queue->load($self->argument_value('queue'));
return $queue->correspond_address;
}
diff --git a/lib/RT/Action/QueueBased.pm b/lib/RT/Action/QueueBased.pm
index cae13c3..306734a 100644
--- a/lib/RT/Action/QueueBased.pm
+++ b/lib/RT/Action/QueueBased.pm
@@ -59,9 +59,7 @@ sub set_queue {
my $queue = shift;
if (!ref($queue)) {
- my $queue_obj = RT::Model::Queue->new;
- $queue_obj->load($queue);
- $queue = $queue_obj;
+ $queue = RT::Model::Queue->load($queue);
}
# Prep the arguments cache
diff --git a/lib/RT/Model/CustomField.pm b/lib/RT/Model/CustomField.pm
index 5969773..efd9414 100755
--- a/lib/RT/Model/CustomField.pm
+++ b/lib/RT/Model/CustomField.pm
@@ -231,8 +231,7 @@ sub create {
}
$args{'lookup_type'} = 'RT::Model::Queue-RT::Model::Ticket';
} else {
- my $queue = RT::Model::Queue->new;
- $queue->load( $args{'queue'} );
+ my $queue = RT::Model::Queue->load($args{'queue'});
unless ( $queue->id ) {
return ( 0, _("Queue not found") );
}
@@ -354,8 +353,7 @@ 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;
- $queue_obj->load( $args{'queue'} );
+ my $queue_obj = RT::Model::Queue->load($args{'queue'});
$args{'queue'} = $queue_obj->id;
}
diff --git a/lib/RT/Model/Group.pm b/lib/RT/Model/Group.pm
index 459c62b..7717af3 100755
--- a/lib/RT/Model/Group.pm
+++ b/lib/RT/Model/Group.pm
@@ -144,8 +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;
- $queue->load( $self->instance );
+ my $queue = RT::Model::Queue->load($self->instance);
return _( "queue %1 %2", $queue->name, $self->type );
} elsif ( $self->domain eq 'RT::Model::Ticket-Role' ) {
return _( "ticket #%1 %2", $self->instance, $self->type );
diff --git a/lib/RT/Model/Template.pm b/lib/RT/Model/Template.pm
index 2a5b048..9072a64 100755
--- a/lib/RT/Model/Template.pm
+++ b/lib/RT/Model/Template.pm
@@ -465,8 +465,7 @@ sub check_create_rights {
right => $right,
);
} else {
- my $queue = RT::Model::Queue->new;
- $queue->load( $args{'queue'} );
+ my $queue = RT::Model::Queue->load($args{'queue'});
unless ( $queue->id ) {
Jifty->log->error(
$self->current_user->id ." tried to create a "
@@ -518,8 +517,7 @@ sub check_delete_rights {
sub queue_obj {
require Carp; Carp::confess("deprecated");
my $self = shift;
- my $q = RT::Model::Queue->new;
- $q->load( $self->__value('queue') );
+ my $q = RT::Model::Queue->load($self->__value('queue'));
return $q;
}
diff --git a/lib/RT/Model/TicketCollection.pm b/lib/RT/Model/TicketCollection.pm
index 047e05c..d9134f5 100755
--- a/lib/RT/Model/TicketCollection.pm
+++ b/lib/RT/Model/TicketCollection.pm
@@ -1225,8 +1225,7 @@ sub _custom_field_decipher {
my $cf;
if ($queue) {
- my $q = RT::Model::Queue->new;
- $q->load($queue);
+ my $q = RT::Model::Queue->load($queue);
if ( $q->id ) {
@@ -1712,8 +1711,7 @@ sub limit_queue {
#TODO value should also take queue objects
if ( defined $args{'value'} && $args{'value'} !~ /^\d+$/ ) {
- my $queue = RT::Model::Queue->new;
- $queue->load( $args{'value'} );
+ my $queue = RT::Model::Queue->load($args{'value'});
$args{'value'} = $queue->id;
}
diff --git a/lib/RT/Model/Transaction.pm b/lib/RT/Model/Transaction.pm
index 7490e08..f6822e9 100755
--- a/lib/RT/Model/Transaction.pm
+++ b/lib/RT/Model/Transaction.pm
@@ -931,10 +931,8 @@ sub brief_description {
if ( $self->field eq 'password' ) {
return _('password changed');
} elsif ( $self->field eq 'queue' ) {
- my $q1 = RT::Model::Queue->new;
- $q1->load( $self->old_value );
- my $q2 = RT::Model::Queue->new;
- $q2->load( $self->new_value );
+ my $q1 = RT::Model::Queue->load($self->old_value);
+ my $q2 = RT::Model::Queue->load($self->new_value);
return _( "%1 changed from %2 to %3", $self->field, $q1->name, $q2->name );
}
diff --git a/lib/RT/Report/Tickets.pm b/lib/RT/Report/Tickets.pm
index 06ae487..d79c0e0 100644
--- a/lib/RT/Report/Tickets.pm
+++ b/lib/RT/Report/Tickets.pm
@@ -91,8 +91,7 @@ sub groupings {
if ($queues) {
my $CustomFields = RT::Model::CustomFieldCollection->new;
foreach my $id ( keys %$queues ) {
- my $queue = RT::Model::Queue->new;
- $queue->load($id);
+ my $queue = RT::Model::Queue->load($id);
unless ( $queue->id ) {
# XXX TODO: This ancient code dates from a former developer
diff --git a/lib/RT/View/Ticket/Links.pm b/lib/RT/View/Ticket/Links.pm
index 8a14724..f072113 100644
--- a/lib/RT/View/Ticket/Links.pm
+++ b/lib/RT/View/Ticket/Links.pm
@@ -113,9 +113,7 @@ template '_elements/edit_cfs' => sub {
$cfs = $ticket->custom_fields;
}
elsif ( get('queue') ) {
- my $queue =
- RT::Model::Queue->new;
- $queue->load( get('queue') );
+ my $queue = RT::Model::Queue->load( get('queue') );
$cfs = $queue->ticket_custom_fields;
}
diff --git a/share/html/Admin/Queues/CustomField.html b/share/html/Admin/Queues/CustomField.html
index 4c1276b..d3ffdeb 100755
--- a/share/html/Admin/Queues/CustomField.html
+++ b/share/html/Admin/Queues/CustomField.html
@@ -57,8 +57,7 @@
</&>
<%INIT>
-my $queue_obj = RT::Model::Queue->new;
-$queue_obj->load($queue);
+my $queue_obj = RT::Model::Queue->load($queue);
my ($title, $current_subtab);
diff --git a/share/html/Admin/Queues/Template.html b/share/html/Admin/Queues/Template.html
index a9d8f28..c3f40f3 100755
--- a/share/html/Admin/Queues/Template.html
+++ b/share/html/Admin/Queues/Template.html
@@ -118,8 +118,7 @@ if ($template_obj->id()) {
};
push @results, @aresults;
} else {
- $queue_obj = RT::Model::Queue->new;
- $queue_obj->load($queue);
+ $queue_obj = RT::Model::Queue->load($queue);
}
</%INIT>
diff --git a/share/html/Admin/Queues/Templates.html b/share/html/Admin/Queues/Templates.html
index 1e34016..4323471 100755
--- a/share/html/Admin/Queues/Templates.html
+++ b/share/html/Admin/Queues/Templates.html
@@ -57,8 +57,7 @@
</&>
<%INIT>
-my $queue_obj = RT::Model::Queue->new;
-$queue_obj->load($id);
+my $queue_obj = RT::Model::Queue->load($id);
my ($title, $current_subtab);
diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
index 8755982..38d994e 100755
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@ -119,8 +119,7 @@ $queue => undef
</%args>
<%init>
my @results;
-my $queue_obj = RT::Model::Queue->new;
-$queue_obj->load($queue);
+my $queue_obj = RT::Model::Queue->load($queue);
my $CFs = $queue_obj->ticket_custom_fields();
my $ValidCFs = $m->comp(
'/Elements/ValidateCustomFields',
diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index 703f2e5..d676305 100755
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -109,8 +109,7 @@ unless ($id || $ticket_obj) {
if ($ARGS{'id'} eq 'new') {
# {{{ Create a new ticket
- my $queue = RT::Model::Queue->new;
- $queue->load($ARGS{'queue'});
+ my $queue = RT::Model::Queue->load($ARGS{'queue'});
unless ( $queue->id ) {
abort('Queue not found');
}
diff --git a/share/html/Tools/Reports/CreatedByDates.html b/share/html/Tools/Reports/CreatedByDates.html
index cc666c8..a2ec27d 100644
--- a/share/html/Tools/Reports/CreatedByDates.html
+++ b/share/html/Tools/Reports/CreatedByDates.html
@@ -52,13 +52,11 @@ $created_after => undef
</%args>
<%init>
my $title = _("Created tickets in period, grouped by status");
-my $q = RT::Model::Queue->new;
+my $q = RT::Model::Queue->load($queue);
my $query = 'Status != "deleted" ';
my $after = RT::DateTime->new_from_string($created_after);
my $before = RT::DateTime->new_from_string($created_before);
-
-$q->load_by_cols(name => $queue);
</%init>
<&| /_elements/wrapper, title => $title &>
<& /Elements/Tabs, current_tab => 'Tools/Reports/CreatedByDates.html', title => $title &>
diff --git a/share/html/Tools/Reports/ResolvedByDates.html b/share/html/Tools/Reports/ResolvedByDates.html
index 0118017..6404522 100644
--- a/share/html/Tools/Reports/ResolvedByDates.html
+++ b/share/html/Tools/Reports/ResolvedByDates.html
@@ -52,13 +52,11 @@ $resolved_after => undef
</%args>
<%init>
my $title = _("Resolved tickets in period, grouped by owner");
-my $q = RT::Model::Queue->new;
+my $q = RT::Model::Queue->load($queue);
my $query = '';
my $after = RT::DateTime->new_from_string($resolved_after);
my $before = RT::DateTime->new_from_string($resolved_before);
-
-$q->load_by_cols(name => $queue);
</%init>
<&| /_elements/wrapper, title => $title &>
<& /Elements/Tabs, current_tab => 'Tools/Reports/ResolvedByDates.html', title => $title &>
diff --git a/share/html/Tools/Reports/ResolvedByOwner.html b/share/html/Tools/Reports/ResolvedByOwner.html
index c6cc3cf..d08042b 100644
--- a/share/html/Tools/Reports/ResolvedByOwner.html
+++ b/share/html/Tools/Reports/ResolvedByOwner.html
@@ -50,8 +50,7 @@ $queue => undef
</%args>
<%init>
my $title = _("Resolved tickets, grouped by owner");
-my $q = RT::Model::Queue->new;
-$q->load_by_cols(name => $queue);
+my $q = RT::Model::Queue->load($queue);
</%init>
<&| /_elements/wrapper, title => $title &>
<& /Elements/Tabs, current_tab => '/Tools/Reports/ResolvedByOwner.html', title => $title &>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list