[freeside-commits] freeside/FS/FS/TicketSystem RT_Internal.pm, 1.22, 1.23

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS/TicketSystem
In directory wavetail.420.am:/tmp/cvs-serv23938/FS/FS/TicketSystem

Modified Files:
	RT_Internal.pm 
Log Message:
fix fallout from selfservice priority, #13199

Index: RT_Internal.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/TicketSystem/RT_Internal.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -d -r1.22 -r1.23
--- RT_Internal.pm	27 Jun 2011 07:11:01 -0000	1.22
+++ RT_Internal.pm	28 Jun 2011 20:28:32 -0000	1.23
@@ -50,7 +50,7 @@
 sub session {
   my( $self, $session ) = @_;
 
-  if ( $session && $session->{'Current_User'} ) {
+  if ( $session && $session->{'Current_User'} ) { # does this even work?
     warn "$me session: using existing session and CurrentUser: \n".
          Dumper($session->{'CurrentUser'})
       if $DEBUG;
@@ -123,16 +123,23 @@
 
   if ( defined( $priority ) ) {
     my $custom_priority = FS::Conf->new->config('ticket_system-custom_priority_field');
+    if ( length( $priority ) ) {
     $rtql .= " AND CF.{$custom_priority} = '$priority'";
   }
+    else {
+      $rtql .= " AND CF.{$custom_priority} IS NULL";
+    }
+  }
 
   $rtql .= ' AND ( ' .
            join(' OR ', map { "Status = '$_'" } $self->statuses) .
            ' )';
 
+  warn "$me _customer_tickets_search:\n$rtql\n" if $DEBUG;
   $Tickets->FromSQL($rtql);
 
   $Tickets->RowsPerPage($limit);
+  warn "\n\n" . $Tickets->BuildSelectQuery . "\n\n" if $DEBUG > 1;
 
   return $Tickets;
 }
@@ -192,7 +199,7 @@
   }
   # make this easy to find
   if ( $custom_priority ) {
-    $ticket_info{'_custom_priority'} = $ticket_info{"CF.{$custom_priority}"};
+    $ticket_info{'content'} = $ticket_info{"CF.{$custom_priority}"};
   }
   if ( $ss_priority ) {
     $ticket_info{'_selfservice_priority'} = $ticket_info{"CF.{$ss_priority}"};