diff options
| -rw-r--r-- | FS/FS/TicketSystem/RT_External.pm | 58 | ||||
| -rw-r--r-- | FS/FS/TicketSystem/RT_Internal.pm | 12 | ||||
| -rw-r--r-- | httemplate/index.html | 7 |
3 files changed, 66 insertions, 11 deletions
diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm index be0823860..187b05c5e 100644 --- a/FS/FS/TicketSystem/RT_External.pm +++ b/FS/FS/TicketSystem/RT_External.pm @@ -2,7 +2,8 @@ package FS::TicketSystem::RT_External; use strict; use vars qw( $conf $default_queueid - $priority_field $priority_field_queue $field ); + $priority_field $priority_field_queue $field + $external_dbh $external_url ); use URI::Escape; use FS::UID; @@ -21,12 +22,22 @@ install_callback FS::UID sub { $priority_field_queue = ''; $field = ''; } + + $external_url = ''; + if ($conf->config('ticket_system') eq 'RT_External') { + my ($datasrc, $user, $pass) = $conf->config('ticket_system-rt_external_datasrc'); + $external_dbh = DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 }) + or die "RT_External DBI->connect error: $DBI::errstr\n"; + + $external_url = $conf->config('ticket_system-rt_external_url'); + } + }; sub num_customer_tickets { my( $self, $custnum, $priority, $dbh ) = @_; - #$dbh ||= create one from some config options + $dbh ||= $external_dbh; my( $from_sql, @param) = $self->_from_customer( $custnum, $priority ); @@ -42,7 +53,7 @@ sub customer_tickets { my( $self, $custnum, $limit, $priority, $dbh ) = @_; $limit ||= 0; - #$dbh ||= create one from some config options + $dbh ||= $external_dbh; my( $from_sql, @param) = $self->_from_customer( $custnum, $priority ); my $sql = "select tickets.*, queues.name". @@ -120,7 +131,7 @@ sub _from_customer { } -sub href_customer_tickets { +sub _href_customer_tickets { my( $self, $custnum, $priority ) = @_; #i snarfed this from an RT bookmarked search, it could be unescaped in the @@ -145,7 +156,11 @@ sub href_customer_tickets { $href .= '&Rows=100'. '&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'; + '&Format=%27%20%20%20%3Cb%3E%3Ca%20href%3D%22'. + $self->baseurl. + 'Ticket%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'. + $self->baseurl. + 'Ticket%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 ( defined($priority) && $field ) { $href .= '%0A%27__CustomField.'. $field. '__%2FTITLE%3ASeverity%27%2C%20'; @@ -160,11 +175,20 @@ sub href_customer_tickets { $href .= '%20%0A%27%3Csmall%3E__ToldRelative__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__LastUpdatedRelative__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__TimeLeft__%3C%2Fsmall%3E%27'; $href; + +} + +sub href_customer_tickets { + + my $self = shift; + return $external_url . $self->_href_customer_tickets(@_); + } -sub href_new_ticket { +sub _href_new_ticket { my( $self, $custnum, $requestors ) = @_; + 'Ticket/Create.html?'. "Queue=$default_queueid". "&new-MemberOf=freeside://freeside/cust_main/$custnum". @@ -172,10 +196,30 @@ sub href_new_ticket { ; } -sub href_ticket { +sub href_new_ticket { + + my $self = shift; + return return $external_url . $self->_href_new_ticket(@_); + +} + +sub _href_ticket { my($self, $ticketnum) = @_; 'Ticket/Display.html?id='.$ticketnum; } +sub href_ticket { + + my $self = shift; + return $external_url . $self->_href_ticket(@_); + +} + +sub baseurl { + + return $external_url; + +} + 1; diff --git a/FS/FS/TicketSystem/RT_Internal.pm b/FS/FS/TicketSystem/RT_Internal.pm index 00398230f..004381141 100644 --- a/FS/FS/TicketSystem/RT_Internal.pm +++ b/FS/FS/TicketSystem/RT_Internal.pm @@ -29,19 +29,25 @@ sub customer_tickets { sub href_customer_tickets { my $self = shift; # well, 2 is wrong here but will have to do for now - popurl(2).'rt/'. $self->SUPER::href_customer_tickets(@_); + baseurl().'rt/'. $self->_href_customer_tickets(@_); } sub href_new_ticket { my $self = shift; # well, 2 is wrong here but will have to do for now - popurl(2).'rt/'. $self->SUPER::href_new_ticket(@_); + baseurl().'rt/'. $self->_href_new_ticket(@_); } sub href_ticket { my $self = shift; # well, 2 is wrong here but will have to do for now - popurl(2).'rt/'. $self->SUPER::href_ticket(@_); + baseurl().'rt/'. $self->_href_ticket(@_); +} + +sub baseurl { + + return popurl(2); + } 1; diff --git a/httemplate/index.html b/httemplate/index.html index c2676025f..90a14b1d5 100644 --- a/httemplate/index.html +++ b/httemplate/index.html @@ -91,12 +91,17 @@ <TABLE CELLSPACING=2 CELLPADDING=0 BORDER=0" WIDTH="100%" BGCOLOR="#eeeeee"> <TR><TH BGCOLOR="#cccccc">Support/Ticketing</TH></TR> <TR><TD> + <% if ( $conf->config('ticket_system') eq 'RT_Internal' ) { %> <BR><FONT SIZE="+1"><A HREF="rt/">Ticketing Main</A></FONT> <BR><BR> Reports <UL> <LI><A HREF="search/cust_main.cgi?browse=tickets">Customers sorted by active tickets</A> - <!-- <LI><A HREF="">Active tickets not assigned to a customer</A> --> + <!-- <LI><A HREF="">Active tickets not assigned to a customer</A> --> + <% } else { %> + <BR><FONT SIZE="+1"><A HREF="<%=FS::TicketSystem->baseurl()%>">Ticketing Main</A></FONT> + <BR><BR> + <% } %> </TD></TR> </TABLE> |