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

[ruz at bestpractical.com]

Author: ruz
Date: Sun Mar 26 20:20:46 2006
New Revision: 4843

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

Log:
 r1040 at cubic-pc:  cubic | 2006-03-27 05:28:07 +0400
 * merge things first and then reload ticket(it has new id at least)


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	Sun Mar 26 20:20:46 2006
@@ -59,12 +59,6 @@
 my $Ticket = LoadTicket($id);
 $id = $ARGS{'id'} = $Ticket->id;
 
-my ($Type) = $m->comp( 'Elements/Type', TicketObj => $Ticket );
-my $Queue = $Ticket->QueueObj->Name;
-
-# XXX: clear radio, checkboxes from format
-$Format =~ s/__RTIR_(?:Radio|Check)__,//;
-
 my $take_or_steal = sub {
     # XXX: we use such code all over the RTIR, we need one method
     my $t = shift;
@@ -86,9 +80,18 @@
             push @results, $msg if $msg;
         }
         push @results, ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
+
+        $Ticket = LoadTicket($id);
+        $id = $ARGS{'id'} = $Ticket->id;
     }
 }
 
+my ($Type) = $m->comp( 'Elements/Type', TicketObj => $Ticket );
+my $Queue = $Ticket->QueueObj->Name;
+
+# XXX: clear radio, checkboxes from format
+$Format =~ s/__RTIR_(?:Radio|Check)__,//;
+
 my $title = loc("Merge [_1] #[_2]: [_3]", $Type, $id, $Ticket->Subject);
 
 $Query ||= $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);