hopefully make links to search for empty value of custom tickets work???

[freeside.git] / FS / FS / TicketSystem / RT_External.pm

diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index 204e7f4..2968a25 100644 (file)
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -3,11 +3,12 @@ package FS::TicketSystem::RT_External;
 use strict;
 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 ) {
@@ -122,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';
   }
 
@@ -139,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';
   }
 
@@ -156,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 {