[Rt-commit] r8050 - rtir/branches/2.3-EXPERIMENTAL/html/RTIR

[ruz at bestpractical.com]

Author: ruz
Date: Mon Jul  2 21:44:46 2007
New Revision: 8050

Modified:
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Merge.html

Log:
* swap merge tickets only if they are in different queues

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	Mon Jul  2 21:44:46 2007
@@ -71,7 +71,7 @@
 
     my @queues = sort map {$_->Name} $Ticket->QueueObj, $MergeTicket->QueueObj;
     if ( $queues[0] eq $queues[1] or ($queues[0] eq "Incident Reports" and $queues[1] eq "Investigations")) {
-        if ( $MergeTicket->QueueObj->Name eq "Incident Reports" ) {
+        if ( $queues[0] ne $queues[1] && $MergeTicket->QueueObj->Name eq "Incident Reports" ) {
             # We always want to merge into the Investigation
             ($Ticket, $MergeTicket) = ($MergeTicket, $Ticket);
         }