[Rt-commit] r16244 - in rt/branches/3.999-DANGEROUS: etc t/api

[ruz at bestpractical.com]

Author: ruz
Date: Wed Oct  8 13:22:02 2008
New Revision: 16244

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/etc/initialdata
   rt/branches/3.999-DANGEROUS/t/api/reminders.t
   rt/branches/3.999-DANGEROUS/t/api/ticket.t

Log:
 r16248 at ruslan-zakirovs-computer:  ruz | 2008-10-08 15:55:07 +0400
 * replace some deprecated calls


Modified: rt/branches/3.999-DANGEROUS/etc/initialdata
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/initialdata	(original)
+++ rt/branches/3.999-DANGEROUS/etc/initialdata	Wed Oct  8 13:22:02 2008
@@ -211,7 +211,7 @@
 you may reply to this message.
 
                         Thank you,
-                        {$ticket->queue_obj->correspond_address()}
+                        {$ticket->queue->correspond_address}
 
 -------------------------------------------------------------------------
 {$transaction->content()}
@@ -226,7 +226,7 @@
 
 {$transaction->created_as_string}: Request {$ticket->id} was acted upon.
 Transaction: {$transaction->description}
-       Queue: {$ticket->queue_obj->name}
+       Queue: {$ticket->queue->name}
      Subject: {$transaction->subject || $ticket->subject || "(No subject given)"}
        owner: {$ticket->owner_obj->name}
   requestors: {$ticket->role_group("requestor")->member_emails_as_string}
@@ -526,7 +526,7 @@
 my $links = $self->ticket_obj->depended_on_by;
 foreach my $link (@{ $links->items_array_ref }) {
     my $obj = $link->base_obj;
-    if ($obj->queue_obj->is_active_status($obj->status)) {
+    if ($obj->queue->is_active_status($obj->status)) {
 	if ($obj->type eq 'ticket') {
 	    $obj->comment(
 		content	=> _("Your request was rejected."),
@@ -552,7 +552,7 @@
 $links = $self->ticket_obj->depends_on;
 foreach my $link (@{ $links->items_array_ref }) {
     my $obj = $link->target_obj;
-    if ($obj->queue_obj->is_active_status($obj->status)) {
+    if ($obj->queue->is_active_status($obj->status)) {
 	$obj->set_status(
 	    Status	=> 'deleted',
 	    Force	=> 1,

Modified: rt/branches/3.999-DANGEROUS/t/api/reminders.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/reminders.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/api/reminders.t	Wed Oct  8 13:22:02 2008
@@ -56,7 +56,7 @@
 # Change queue
 ok (my ($move_val, $move_msg) = $t->set_queue('reminders tests 2'), 'Moving ticket from queue "reminders tests" to "reminders tests 2"');
 
-is ($t->queue_obj->name, 'reminders tests 2', 'Ticket successfully moved');
+is ($t->queue->name, 'reminders tests 2', 'Ticket successfully moved');
 
 # Check that the new reminder is still there and moved to the new queue
 $reminders = $t->reminders->collection;
@@ -67,7 +67,7 @@
     next unless $found == 0;
     if ( $reminder->subject =~ m/TestReminder/ ) {
         $found = 1;
-        $ok_queue = 1 if ( $reminder->queue_obj->name eq 'reminders tests 2' );
+        $ok_queue = 1 if ( $reminder->queue->name eq 'reminders tests 2' );
     }
 }
 is($found, 1, 'Reminder successfully added');

Modified: rt/branches/3.999-DANGEROUS/t/api/ticket.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/ticket.t	(original)
+++ rt/branches/3.999-DANGEROUS/t/api/ticket.t	Wed Oct  8 13:22:02 2008
@@ -62,7 +62,7 @@
 ok(my $t2 = RT::Model::Ticket->new(current_user => RT->system_user));
 ok($t2->load($id));
 is($t2->subject, 'Testing');
-is($t2->queue_obj->id, $testqueue->id);
+is($t2->queue->id, $testqueue->id);
 is($t2->owner_obj->id, $u->id);
 
 my $t3 = RT::Model::Ticket->new(current_user => RT->system_user);