diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:18:55 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:18:55 -0700 |
| commit | 1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 (patch) | |
| tree | 96922ad4459eda1e649327fd391d60c58d454c53 /rt/share/html/Ticket/Forward.html | |
| parent | 4f5619288413a185e9933088d9dd8c5afbc55dfa (diff) | |
RT 4.2.11, ticket#13852
Diffstat (limited to 'rt/share/html/Ticket/Forward.html')
| -rw-r--r-- | rt/share/html/Ticket/Forward.html | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/rt/share/html/Ticket/Forward.html b/rt/share/html/Ticket/Forward.html index e457aeb..2970298 100644 --- a/rt/share/html/Ticket/Forward.html +++ b/rt/share/html/Ticket/Forward.html @@ -61,19 +61,32 @@ <td><% $from %></td></tr> <tr><td align="right"><&|/l&>Subject</&>:</td> -<td><% $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> +<td><& /Elements/EmailInput, Name => "Cc", AutocompleteMultiple => 1, Default => $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 => "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> @@ -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> |