X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTicketSystem%2FRT_Internal.pm;h=6b2d3544c9887d0e55c6f592aeac718e6f2c2606;hb=9e0d1dacd8db275dff7f5827bc65b3f1531f8882;hp=6fb2c187de835db9f7b75e211add7623d5cb0927;hpb=9aee669886202be7035e6c6049fc71bc99dd3013;p=freeside.git

diff --git a/FS/FS/TicketSystem/RT_Internal.pm b/FS/FS/TicketSystem/RT_Internal.pm
index 6fb2c187d..6b2d3544c 100644
--- a/FS/FS/TicketSystem/RT_Internal.pm
+++ b/FS/FS/TicketSystem/RT_Internal.pm
@@ -111,7 +111,7 @@ properly.
 # create an RT::Tickets object for a specified custnum or svcnum
 
 sub _tickets_search {
-  my( $self, $type, $number, $limit, $priority, $status ) = @_;
+  my( $self, $type, $number, $limit, $priority, $status, $queueid ) = @_;
 
   $type =~ /^Customer|Service$/ or die "invalid type: $type";
   $number =~ /^\d+$/ or die "invalid custnum/svcnum: $number";
@@ -159,6 +159,8 @@ sub _tickets_search {
                       join(' OR ', map { "Status = '$_'" } @statuses).
                ' ) ';
 
+  $rtql .= " AND Queue = $queueid " if $queueid;
+
   warn "$me _customer_tickets_search:\n$rtql\n" if $DEBUG;
   $Tickets->FromSQL($rtql);
 
@@ -466,6 +468,9 @@ sub get_ticket_object {
   }
   my $Tickets = RT::Tickets->new($session->{CurrentUser});
   $Tickets->FromSQL($query);
+  if ( $DEBUG ) { # temporary for RT#39536
+    warn "[get_ticket_object] " . $Tickets->BuildSelectQuery . "\n\n";
+  }
   return $Tickets->First;
 }
 
@@ -570,7 +575,7 @@ sub _web_external_auth {
 
           # now get user specific information, to better create our user.
           my $new_user_info
-              = RT::Interface::Web::WebExternalAutoInfo($user);
+              = RT::Interface::Web::WebRemoteUserAutocreateInfo($user);
 
           # set the attributes that have been defined.
           # FIXME: this is a horrible kludge. I'm sure there's something cleaner