X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTicketSystem%2FRT_External.pm;h=2968a25897825d82f396f4a40505f56daaca62db;hb=63e2de2cc8d24c30ccf3ee39b0c427f83b3e6f74;hp=986ad21dd16cf0bfe2fff616e390a2685d1fba35;hpb=8556d71539c53a4016b0d32d1e4fed8f17d7a853;p=freeside.git

diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index 986ad21dd..2968a2589 100644
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -1,12 +1,14 @@
 package FS::TicketSystem::RT_External;
 
 use strict;
-use vars qw( $conf $priority_field $priority_field_queue $field );
+use vars qw( $conf $default_queueid
+             $priority_field $priority_field_queue $field );
+use URI::Escape;
 use FS::UID;
 
 install_callback FS::UID sub { 
   my $conf = new FS::Conf;
-  my $default_queueid = $conf->config('ticket_system-default_queueid');
+  $default_queueid = $conf->config('ticket_system-default_queueid');
   $priority_field =
     $conf->config('ticket_system-custom_priority_field');
   if ( $priority_field ) {
@@ -43,7 +45,9 @@ sub customer_tickets {
   #$dbh ||= create one from some config options
 
   my( $from_sql, @param) = $self->_from_customer( $custnum, $priority );
-  my $sql = "select * $from_sql order by priority desc limit $limit";
+  my $sql = "select tickets.*, queues.name".
+            ( length($priority) ? ", ticketcustomfieldvalues.content" : '' ).
+            " $from_sql order by priority desc limit $limit";
   my $sth = $dbh->prepare($sql) or die $dbh->errstr. "preparing $sql";
   $sth->execute(@param)         or die $sth->errstr. "executing $sql";
 
@@ -119,16 +123,18 @@ sub _from_customer {
 sub href_customer_tickets {
   my( $self, $custnum, $priority ) = @_;
 
+  #i snarfed this from an RT bookmarked search, it could be unescaped in the
+  #source for readability and run through uri_escape
   my $href = 
     'Search/Results.html?Order=ASC&Query=%20MemberOf%20%3D%20%27freeside%3A%2F%2Ffreeside%2Fcust_main%2F'.
     $custnum.
     '%27%20%20AND%20%28%20Status%20%3D%20%27open%27%20%20OR%20Status%20%3D%20%27new%27%20%20OR%20Status%20%3D%20%27stalled%27%20%29%20'
   ;
 
-  if ( $priority && $field && $priority_field_queue ) {
+  if ( defined($priority) && $field && $priority_field_queue ) {
     $href .= 'AND%20Queue%20%3D%20%27'. $priority_field_queue. '%27%20';
   }
-  if ( $priority && $field ) {
+  if ( defined($priority) && $field ) {
     $href .= '%20AND%20%27CF.'. $field. '%27%20%3D%20%27'. $priority. '%27%20';
   }
 
@@ -136,13 +142,13 @@ sub href_customer_tickets {
            '&OrderBy=id&Page=1'.
            '&Format=%27%20%20%20%3Cb%3E%3Ca%20href%3D%22%2Ffreeside%2Frt%2FTicket%2FDisplay.html%3Fid%3D__id__%22%3E__id__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3A%23%27%2C%20%0A%27%3Cb%3E%3Ca%20href%3D%22%2Ffreeside%2Frt%2FTicket%2FDisplay.html%3Fid%3D__id__%22%3E__Subject__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3ASubject%27%2C%20%0A%27__Status__%27%2C%20';
 
-  if ( $priority && $field ) {
+  if ( defined($priority) && $field ) {
     $href .= '%0A%27__CustomField.'. $field. '__%2FTITLE%3ASeverity%27%2C%20';
   }
 
   $href .= '%0A%27__QueueName__%27%2C%20%0A%27__OwnerName__%27%2C%20%0A%27__Priority__%27%2C%20%0A%27__NEWLINE__%27%2C%20%0A%27%27%2C%20%0A%27%3Csmall%3E__Requestors__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__CreatedRelative__%3C%2Fsmall%3E%27%2C';
 
-  if ( $priority && $field ) {
+  if ( defined($priority) && $field ) {
     $href .=   '%20%0A%27__-__%27%2C';
   }
 
@@ -153,10 +159,12 @@ sub href_customer_tickets {
 
 
 sub href_new_ticket {
-  my( $self, $custnum ) = @_;
+  my( $self, $custnum, $requestors ) = @_;
   'Ticket/Create.html?'.
     "Queue=$default_queueid".
-    "&new-MemberOf=freeside://freeside/cust_main/$custnum";
+    "&new-MemberOf=freeside://freeside/cust_main/$custnum".
+    ( $requestors ? '&Requestors='. uri_escape($requestors) : '' )
+    ;
 }
 
 sub href_ticket {