[Rt-commit] r14378 - rt/3.8/trunk/lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Tue Jul 22 10:25:27 2008
New Revision: 14378

Modified:
   rt/3.8/trunk/lib/RT/Tickets_Overlay.pm

Log:
* CF->Queue method has been deprecated and deleted,
  but there was still a call in the code.

Modified: rt/3.8/trunk/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/3.8/trunk/lib/RT/Tickets_Overlay.pm	Tue Jul 22 10:25:27 2008
@@ -2462,12 +2462,12 @@
             $CF->Name, $args{OPERATOR}, $args{VALUE} );
     }
 
-    my $q = "";
-    if ( $CF->Queue ) {
-        my $qo = new RT::Queue( $self->CurrentUser );
-        $qo->Load( $CF->Queue );
-        $q = $qo->Name;
+    if ( defined $args{'QUEUE'} && $args{'QUEUE'} =~ /\D/ ) {
+        my $QueueObj = RT::Queue->new( $self->CurrentUser );
+        $QueueObj->Load( $args{'QUEUE'} );
+        $args{'QUEUE'} = $QueueObj->Id;
     }
+    delete $args{'QUEUE'} unless defined $args{'QUEUE'} && length $args{'QUEUE'};
 
     my @rest;
     @rest = ( ENTRYAGGREGATOR => 'AND' )
@@ -2475,12 +2475,9 @@
 
     $self->Limit(
         VALUE => $args{VALUE},
-        FIELD => "CF."
-            . (
-              $q
-            ? $q . ".{" . $CF->Name . "}"
-            : $CF->Name
-            ),
+        FIELD => "CF"
+            .(defined $ARGS{'QUEUE'}? ".{$ARGS{'QUEUE'}}" : '' )
+            .".{" . $CF->Name . "}",
         OPERATOR    => $args{OPERATOR},
         CUSTOMFIELD => 1,
         @rest,