X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FTicket%2FForward.html;h=9d6343b429ebcd3c5c6a456dac63dce4d8f5f2a9;hp=87c2d0a3c547e65f9dfbca9af2dc096eb6b3b6f2;hb=44dd00a3ff974a17999e86e64488e996edc71e3c;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941

diff --git a/rt/share/html/Ticket/Forward.html b/rt/share/html/Ticket/Forward.html
index 87c2d0a3c..9d6343b42 100644
--- a/rt/share/html/Ticket/Forward.html
+++ b/rt/share/html/Ticket/Forward.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,35 +46,47 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Elements/Header, Title => $Title &>
-<& /Ticket/Elements/Tabs, 
-    Ticket => $TicketObj, 
-    Title  => $Title,
-&>
+<& /Elements/Tabs &>
 
 % $m->callback(CallbackName => 'BeforeActionList', Actions => \@results, ARGSRef => \%ARGS, Ticket => $TicketObj);
 <& /Elements/ListActions, actions => \@results &>
 
-<form action="Forward.html" name="ForwardMessage" method="post">
+<form action="Forward.html" id="ForwardMessage" name="ForwardMessage" method="post">
 % $m->callback( CallbackName => 'FormStart', ARGSRef => \%ARGS );
 <input type="hidden" class="hidden" name="id" value="<% $id %>" /><br />
-<input type="hidden" class="hidden" name="QuoteTransaction" value="<% $ARGS{'QuoteTransaction'} %>" />
+<input type="hidden" class="hidden" name="QuoteTransaction" value="<% $ARGS{'QuoteTransaction'} || '' %>" />
 
 <table border="0">
+<tr><td align="right"><&|/l&>From</&>:</td>
+<td><% $from %></td></tr>
 
 <tr><td align="right"><&|/l&>Subject</&>:</td>
-<td><% $TicketObj->Subject %></td></tr>
+<td><input name="Subject" size="60" value="<% $ARGS{'Subject'} || $subject %>" /></td></tr>
 
 <tr><td align="right"><&|/l&>To</&>:</td>
-<td><input name="To" size="60" value="<% $ARGS{'To'} %>" /></td></tr>
+<td><& /Elements/EmailInput, Name => "To", AutocompleteMultiple => 1, Default => $ARGS{'To'} &></td></tr>
 
 <tr><td align="right"><&|/l&>Cc</&>:</td>
-<td><input name="Cc" size="60" value="<% $ARGS{'Cc'} %>" /></td></tr>
-
-<tr><td align="right"><&|/l&>BCc</&>:</td>
-<td><input name="Bcc" size="60" value="<% $ARGS{'Bcc'} %>" /></td></tr>
+<td><& /Elements/EmailInput, Name => "Cc", AutocompleteMultiple => 1, Default => $ARGS{'Cc'} &></td></tr>
+
+<tr><td align="right"><&|/l&>Bcc</&>:</td>
+<td><& /Elements/EmailInput, Name => "Bcc", AutocompleteMultiple => 1, Default => $ARGS{'Bcc'} &></td></tr>
+
+<tr>
+<td><&|/l&>Content</&>:</td>
+<td>
+% if (exists $ARGS{Content}) {
+<& /Elements/MessageBox, Default => $ARGS{Content}, IncludeSignature => 0 &>
+% } else {
+<& /Elements/MessageBox  &>
+%}
+</td>
+</tr>
 
 </table>
 
+<& /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' &>
 </form>
@@ -95,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 ) {
@@ -110,8 +119,18 @@ if ( $Forward || $ForwardAndReturn ) {
 }
 
 my $Title = $txn
-    ? loc('Forward transaction #[_1]', $txn->id)
-    : loc('Forward ticket #[_1]', $TicketObj->id);
+    ? loc('Forward transaction #[_1]: [_2]', $txn->id, $TicketObj->Subject)
+    : loc('Forward ticket #[_1]: [_2]', $TicketObj->id, $TicketObj->Subject);
+
+my $from = RT::Interface::Email::GetForwardFrom(
+    $txn ? ( Transaction => $txn ) : ( Ticket => $TicketObj ) );
+
+my $subject = "Fwd: ".($txn || $TicketObj)->Subject;
+
+my $attachments = RT::Interface::Email::GetForwardAttachments(
+    Ticket => $TicketObj,
+    $txn ? ( Transaction => $txn ) : (),
+);
 
 </%INIT>