X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FTicket%2FForward.html;h=2970298dad8b8e2e424a9e635f6b45b62d426687;hb=1c538bfabc2cd31f27067505f0c3d1a46cba6ef0;hp=e457aeb0c3c0dd724218101d097557d8b6756829;hpb=4f5619288413a185e9933088d9dd8c5afbc55dfa;p=freeside.git
diff --git a/rt/share/html/Ticket/Forward.html b/rt/share/html/Ticket/Forward.html
index e457aeb0c..2970298da 100644
--- a/rt/share/html/Ticket/Forward.html
+++ b/rt/share/html/Ticket/Forward.html
@@ -61,19 +61,32 @@
<% $from %> |
<&|/l&>Subject&>: |
-<% $subject %> |
+ |
<&|/l&>To&>: |
- |
+<& /Elements/EmailInput, Name => "To", AutocompleteMultiple => 1, Default => $ARGS{'To'} &> |
<&|/l&>Cc&>: |
- |
+<& /Elements/EmailInput, Name => "Cc", AutocompleteMultiple => 1, Default => $ARGS{'Cc'} &> |
<&|/l&>Bcc&>: |
- |
+<& /Elements/EmailInput, Name => "Bcc", AutocompleteMultiple => 1, Default => $ARGS{'Bcc'} &> |
+
+
+<&|/l&>Content&>: |
+
+% if (exists $ARGS{Content}) {
+<& /Elements/MessageBox, Default => $ARGS{Content}, IncludeSignature => 0 &>
+% } else {
+<& /Elements/MessageBox &>
+%}
+ |
+
+<& /Ticket/Elements/ShowAttachments, Ticket => $TicketObj, Attachments => $attachments &>
+
<& /Elements/Submit, Label => loc('Forward Message and Return'), Name => 'ForwardAndReturn' &>
<& /Elements/Submit, Label => loc('Forward Message'), Name => 'Forward' &>
@@ -94,10 +107,7 @@ if ( $QuoteTransaction ) {
my @results;
if ( $Forward || $ForwardAndReturn ) {
- require RT::Interface::Email;
- my ($status, $msg) = $txn
- ? RT::Interface::Email::ForwardTransaction( $txn, %ARGS )
- : RT::Interface::Email::ForwardTicket( $TicketObj, %ARGS );
+ my ( $status, $msg ) = $TicketObj->Forward( Transaction => $txn, %ARGS );
push @results, $msg;
if ( $ForwardAndReturn ) {
@@ -115,9 +125,12 @@ my $Title = $txn
my $from = RT::Interface::Email::GetForwardFrom(
$txn ? ( Transaction => $txn ) : ( Ticket => $TicketObj ) );
-my $subject = $TicketObj->Subject;
-$subject = RT::Interface::Email::AddSubjectTag( $subject, $TicketObj )
- unless RT->Config->Get('ForwardFromUser');
+my $subject = "Fwd: ".($txn || $TicketObj)->Subject;
+
+my $attachments = RT::Interface::Email::GetForwardAttachments(
+ Ticket => $TicketObj,
+ $txn ? ( Transaction => $txn ) : (),
+);
%INIT>