X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTicketSystem%2FRT_External.pm;h=8ccc9371248d70da28d1ce9e5652cec7d3cb59c1;hb=262e0d79deda87cdf9a289227f56dd4619f8581f;hp=d1c9ebf21315e1d8d8de5fdcc85ec939a7cc208d;hpb=f8a8f142236a338fde4b733df48e022d19748c88;p=freeside.git

diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index d1c9ebf21..8ccc93712 100644
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -156,14 +156,16 @@ sub _from_customer {
   }
 
   my $sql = "
-                    FROM Tickets
-                    JOIN Queues ON ( Tickets.Queue = Queues.id       )
-                    JOIN Links  ON ( Tickets.id    = Links.LocalBase )
-                    JOIN Users  ON ( Tickets.Owner = Users.id        )
-                    $join 
-       WHERE ( ". join(' OR ', map "Status = '$_'", $self->statuses ). " )
-         AND Target = 'freeside://freeside/cust_main/$custnum'
-         $where
+    FROM Tickets
+      JOIN Queues ON ( Tickets.Queue = Queues.id )
+      JOIN Users  ON ( Tickets.Owner = Users.id  )
+      JOIN Links  ON ( Tickets.id    = Links.LocalBase
+                       AND Links.Base LIKE '%/ticket/' || Tickets.id )
+      $join 
+
+    WHERE ( ". join(' OR ', map "Status = '$_'", $self->statuses ). " )
+      AND Target = 'freeside://freeside/cust_main/$custnum'
+      $where
   ";
 
   ( $sql, @param );
@@ -315,7 +317,7 @@ sub _retrieve_single_value {
 sub transaction_creator {
   my( $self, $transaction_id ) = @_;
 
-  my $sql = "SELECT Name FRP< Transactions JOIN Users ON ".
+  my $sql = "SELECT Name FROM Transactions JOIN Users ON ".
             "Transactions.Creator=Users.id WHERE Transactions.id = ".
             $transaction_id;
 
@@ -349,5 +351,10 @@ sub transaction_status {
   $self->_retrieve_single_value($sql);
 }
 
+sub access_right {
+  warn "WARNING: no access rights available w/ external RT";
+  0;
+}
+
 1;