[Rt-commit] r18135 - in rt/3.999/branches/merge_to_3.8.2: . etc lib/RT/Approval/Rule lib/RT/ScripAction

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Mon Feb  2 22:31:57 2009
New Revision: 18135

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/etc/initialdata
   rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/NewPending.pm
   rt/3.999/branches/merge_to_3.8.2/lib/RT/Model/Ticket.pm
   rt/3.999/branches/merge_to_3.8.2/lib/RT/ScripAction/CreateTickets.pm
   rt/3.999/branches/merge_to_3.8.2/lib/RT/ScripAction/Notify.pm

Log:
 r19448 at sunnavys-mb:  sunnavy | 2009-02-03 11:30:26 +0800
 ->owner_obj => ->owner


Modified: rt/3.999/branches/merge_to_3.8.2/etc/initialdata
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/etc/initialdata	(original)
+++ rt/3.999/branches/merge_to_3.8.2/etc/initialdata	Mon Feb  2 22:31:57 2009
@@ -235,7 +235,7 @@
 Transaction: {$transaction->description}
        Queue: {$ticket->queue->name}
      Subject: {$transaction->subject || $ticket->subject || "(No subject given)"}
-       owner: {$ticket->owner_obj->name}
+       owner: {$ticket->owner->name}
   requestors: {$ticket->role_group("requestor")->member_emails_as_string}
       Status: {$ticket->status}
  Ticket <URL: {RT->config->get(\'WebURL\')}Ticket/Display.html?id={$ticket->id} >
@@ -362,7 +362,7 @@
 
 Greetings,
 
-Your ticket has been rejected by { eval { $approval->owner_obj->name } }.
+Your ticket has been rejected by { eval { $approval->owner->name } }.
 
 Approver\'s notes: { $notes }
 '

Modified: rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/NewPending.pm
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/NewPending.pm	(original)
+++ rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/NewPending.pm	Mon Feb  2 22:31:57 2009
@@ -89,7 +89,7 @@
     my ( $result, $msg ) = $template->parse(
         ticket_obj => $top,
     );
-    $self->ticket_obj->comment( cc_message_to => $self->ticket_obj->owner_obj->email, mime_obj => $template->mime_obj );
+    $self->ticket_obj->comment( cc_message_to => $self->ticket_obj->owner->email, mime_obj => $template->mime_obj );
 
 }
 

Modified: rt/3.999/branches/merge_to_3.8.2/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/lib/RT/Model/Ticket.pm	(original)
+++ rt/3.999/branches/merge_to_3.8.2/lib/RT/Model/Ticket.pm	Mon Feb  2 22:31:57 2009
@@ -1199,11 +1199,11 @@
     #   }
 
     #Tickets won't yet have owners when they're being created.
-    unless ( $self->owner_obj->id ) {
+    unless ( $self->owner->id ) {
         return (undef);
     }
 
-    if ( $person->id == $self->owner_obj->id ) {
+    if ( $person->id == $self->owner->id ) {
         return (1);
     } else {
         return (undef);
@@ -1323,7 +1323,7 @@
     }
 
     unless (
-        $self->owner_obj->has_right(
+        $self->owner->has_right(
             right  => 'OwnTicket',
             object => $Newqueue_obj
         )
@@ -2242,7 +2242,7 @@
 
 sub owner_as_string {
     my $self = shift;
-    return ( $self->owner_obj->email );
+    return ( $self->owner->email );
 
 }
 
@@ -2268,7 +2268,7 @@
     $self->set_last_updated();    # lock the ticket
     $self->load( $self->id );     # in case $self changed while waiting for lock
 
-    my $old_owner_obj = $self->owner_obj;
+    my $old_owner_obj = $self->owner;
 
     my $new_owner_obj = RT::Model::User->new;
     $new_owner_obj->load($NewOwner);

Modified: rt/3.999/branches/merge_to_3.8.2/lib/RT/ScripAction/CreateTickets.pm
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/lib/RT/ScripAction/CreateTickets.pm	(original)
+++ rt/3.999/branches/merge_to_3.8.2/lib/RT/ScripAction/CreateTickets.pm	Mon Feb  2 22:31:57 2009
@@ -939,7 +939,7 @@
     $string .= "starts: " . $t->starts_obj->as_string . "\n";
     $string .= "Started: " . $t->started_obj->as_string . "\n";
     $string .= "Resolved: " . $t->resolved_obj->as_string . "\n";
-    $string .= "Owner: " . $t->owner_obj->name . "\n";
+    $string .= "Owner: " . $t->owner->name . "\n";
     $string .= "Requestor: " . $t->role_group("requestor")->member_emails_as_string . "\n";
     $string .= "Cc: " . $t->role_group("cc")->member_emails_as_string . "\n";
     $string .= "AdminCc: " . $t->role_group("admin_cc")->member_emails_as_string . "\n";

Modified: rt/3.999/branches/merge_to_3.8.2/lib/RT/ScripAction/Notify.pm
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/lib/RT/ScripAction/Notify.pm	(original)
+++ rt/3.999/branches/merge_to_3.8.2/lib/RT/ScripAction/Notify.pm	Mon Feb  2 22:31:57 2009
@@ -107,14 +107,14 @@
         }
     }
 
-    if ( $arg =~ /\bOwner\b/i && $ticket->owner_obj->id != RT->nobody->id ) {
+    if ( $arg =~ /\bOwner\b/i && $ticket->owner->id != RT->nobody->id ) {
 
         # If we're not sending to Ccs or requestors,
         # then the Owner can be the To.
         if (@To) {
-            push( @Bcc, $ticket->owner_obj->email );
+            push( @Bcc, $ticket->owner->email );
         } else {
-            push( @To, $ticket->owner_obj->email );
+            push( @To, $ticket->owner->email );
         }
 
     }