[Rt-commit] r8292 - in rtir/branches/2.3-EXPERIMENTAL: .

[thayes at bestpractical.com]

Author: thayes
Date: Wed Jul 25 17:31:35 2007
New Revision: 8292

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

Log:
 r8434 at toth:  toth | 2007-07-25 17:31:18 -0400
 * Added locking to the RTIR Merge feature
 


Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html	Wed Jul 25 17:31:35 2007
@@ -35,6 +35,8 @@
     current_subtab => 'RTIR/Search/Refine.html',
 &>
 
+<& /Elements/ShowLock, Ticket => $Ticket, noUnlock => 1 &> 
+
 <& /Elements/ListActions, actions => \@results &>
 
 <form action="<% RT->Config->Get('WebPath') %>/RTIR/Merge.html" method="post">
@@ -65,10 +67,13 @@
 
 <%INIT>
 my $Ticket = LoadTicket($id);
+$Ticket->Lock() unless $Ticket->Locked();
 $id = $ARGS{'id'} = $Ticket->id;
 
 my (@results);
 if ( $SelectedTicket ) {
+	$Ticket->Unlock() if $Ticket->Locked();
+	
     my $MergeTicket = LoadTicket( $SelectedTicket );
 
     my @queues = sort map {$_->Name} $Ticket->QueueObj, $MergeTicket->QueueObj;
@@ -89,6 +94,7 @@
         push @results, ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS);
 
         $Ticket = LoadTicket($id);
+        #push @results, "Ticket " . $Ticket->id . " unlocked" if $Ticket->Locked() && $Ticket->Unlock();
         return $m->comp('/RTIR/Display.html', id => $Ticket->id, results => \@results );
     } else {
         push @results, loc("Merge failed: Ticket #[_1] is not the right type", $MergeTicket->Id );