[Rt-commit] r4873 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR

[alexmv at bestpractical.com]

Author: alexmv
Date: Wed Mar 29 15:49:08 2006
New Revision: 4873

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html

Log:
 r11956 at zoq-fot-pik:  chmrr | 2006-03-29 15:48:57 -0500
  * Use the shiny new TakeOrSteal method


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html	Wed Mar 29 15:49:08 2006
@@ -51,14 +51,6 @@
 my $Ticket = LoadTicket($id);
 $id = $ARGS{'id'} = $Ticket->id;
 
-my $take_or_steal = sub {
-    # XXX: we use such code all over the RTIR, we need one method
-    my $t = shift;
-    return 1 if $t->Owner == $t->CurrentUser->id;
-    return $t->Take if $t->Owner == $RT::Nobody->id;
-    return $t->Steal;
-};
-
 my (@results);
 if ( $SelectedTicket ) {
     my $MergeTicket = LoadTicket( $SelectedTicket );
@@ -73,7 +65,7 @@
         $ARGS{ $Ticket->id .'-MergeInto' } = $MergeTicket->id;            
 
         foreach ( $Ticket, $MergeTicket ) {
-            my ($status, $msg) = $take_or_steal->( $_ );
+            my ($status, $msg) = $_->TakeOrSteal;
             push @results, $msg if $msg;
         }
         push @results, ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);