[Rt-commit] rt branch, 4.0/web-forward-show-from, updated. rt-4.0.1rc1-8-gc51828d

[Alex Vandiver]

The branch, 4.0/web-forward-show-from has been updated
       via  c51828dddca5e340ca266df835d1e7ea51708dfb (commit)
      from  4e728fe880723297fe6a9800a0bc418e853ed46b (commit)

Summary of changes:
 share/html/Ticket/Forward.html |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit c51828dddca5e340ca266df835d1e7ea51708dfb
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jul 28 16:34:37 2011 -0400

    When forwarding, adjust expected subject line according to ForwardFromUser

diff --git a/share/html/Ticket/Forward.html b/share/html/Ticket/Forward.html
index 386662a..81ef8b0 100644
--- a/share/html/Ticket/Forward.html
+++ b/share/html/Ticket/Forward.html
@@ -61,7 +61,7 @@
 <td><% $from %></td></tr>
 
 <tr><td align="right"><&|/l&>Subject</&>:</td>
-<td><% $TicketObj->Subject %></td></tr>
+<td><% $subject %></td></tr>
 
 <tr><td align="right"><&|/l&>To</&>:</td>
 <td><input name="To" size="60" value="<% $ARGS{'To'} || '' %>" /></td></tr>
@@ -115,6 +115,10 @@ 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');
+
 </%INIT>
 
 <%ARGS>

-----------------------------------------------------------------------