[Rt-commit] rt branch, 3.999-trunk, updated. 20bcfccd204869971b757ebe19afeeada34370d1

sartak at bestpractical.com sartak at bestpractical.com
Thu Dec 3 06:14:35 EST 2009


The branch, 3.999-trunk has been updated
       via  20bcfccd204869971b757ebe19afeeada34370d1 (commit)
      from  26c8851a4f3ffe08488670fee3513af3db5075f1 (commit)

Summary of changes:
 lib/RT/Model/Ticket.pm |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

- Log -----------------------------------------------------------------
commit 20bcfccd204869971b757ebe19afeeada34370d1
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Dec 3 06:14:22 2009 -0500

    Simplify a bunch of canonicalizers by using Queue->load

diff --git a/lib/RT/Model/Ticket.pm b/lib/RT/Model/Ticket.pm
index 774141a..a9795ca 100755
--- a/lib/RT/Model/Ticket.pm
+++ b/lib/RT/Model/Ticket.pm
@@ -806,9 +806,7 @@ sub canonicalize_due {
     }
 
     if ($metadata->{for} eq 'create') {
-        my $queue = $self->queue_id || $other->{queue};
-        my $queue_obj = RT::Model::Queue->new;
-        $queue_obj->load($queue);
+        my $queue_obj = RT::Model::Queue->load($self->queue_id || $other->{queue});
 
         if ( my $due_in = $queue_obj->default_due_in ) {
             my $due = RT::DateTime->now;
@@ -852,9 +850,7 @@ sub canonicalize_started {
         return RT::DateTime->new_from_string($started);
     }
 
-    my $queue = $self->queue_id || $other->{queue};
-    my $queue_obj = RT::Model::Queue->new;
-    $queue_obj->load($queue);
+    my $queue_obj = RT::Model::Queue->load($self->queue_id || $other->{queue});
 
     if ( !$queue_obj->status_schema->is_initial($other->{status}) ) {
         return RT::DateTime->now;
@@ -879,9 +875,7 @@ sub canonicalize_resolved {
         return RT::DateTime->new_from_string($resolved);
     }
 
-    my $queue = $self->queue_id || $other->{queue};
-    my $queue_obj = RT::Model::Queue->new;
-    $queue_obj->load($queue);
+    my $queue_obj = RT::Model::Queue->load($self->queue_id || $other->{queue});
 
     if ($queue_obj->status_schema->is_inactive($other->{status})) {
         return RT::DateTime->now;
@@ -920,9 +914,7 @@ sub canonicalize_initial_priority {
 
     return $initial if defined $initial;
 
-    my $queue = $self->queue_id || $other->{queue};
-    my $queue_obj = RT::Model::Queue->new;
-    $queue_obj->load($queue);
+    my $queue_obj = RT::Model::Queue->load($self->queue_id || $other->{queue});
 
     return $queue_obj->initial_priority || 0;
 }
@@ -940,9 +932,7 @@ sub canonicalize_final_priority {
 
     return $final if defined $final;
 
-    my $queue = $self->queue_id || $other->{queue};
-    my $queue_obj = RT::Model::Queue->new;
-    $queue_obj->load($queue);
+    my $queue_obj = RT::Model::Queue->load($self->queue_id || $other->{queue});
 
     return $queue_obj->final_priority || 0;
 }

-----------------------------------------------------------------------


More information about the Rt-commit mailing list