projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
986ad21
..
2968a25
100644
(file)
--- 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;
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;
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 ) {
$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 );
#$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";
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 ) = @_;
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'
;
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';
}
$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';
}
$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';
'&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';
$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';
}
$href .= '%20%0A%27__-__%27%2C';
}
@@
-153,10
+159,12
@@
sub href_customer_tickets {
sub href_new_ticket {
sub href_new_ticket {
- my( $self, $custnum ) = @_;
+ my( $self, $custnum
, $requestors
) = @_;
'Ticket/Create.html?'.
"Queue=$default_queueid".
'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 {
}
sub href_ticket {