[Rt-commit] rt branch 5.0/retain-signature-when-quoting created. rt-5.0.1-609-ge84e2f0d6d

[BPS Git Server]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "rt".

The branch, 5.0/retain-signature-when-quoting has been created
        at  e84e2f0d6d5cd7a77424258b9c6d66bfe634af14 (commit)

- Log -----------------------------------------------------------------
commit e84e2f0d6d5cd7a77424258b9c6d66bfe634af14
Author: Steven Burr <steve at bestpractical.com>
Date:   Wed Sep 1 09:06:46 2021 -0400

    Retain signature if quoting content on correspondence
    
    The UpdateContent argument to Ticket/Update.html will be quoted
    as the initial value of the correspondence. It is passed, for example,
    when quoteselection.js has created the ticket update link after
    processing the current selection. However, the current behavior will
    always hide any signature if this argument is supplied. This commit
    changes the signature behavior to be the same as when UpdateContent
    is not supplied.

diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index 21bb8ed522..1c20062fa5 100644
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -178,15 +178,15 @@
 <div class="form-group">
   <div class="messagebox-container action-<% $type %>">
 % $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
+% my $IncludeSignature = 1;
+% $IncludeSignature = 0 if $Action ne 'Respond' && !RT->Config->Get('MessageBoxIncludeSignatureOnComment');
 % if (exists $ARGS{UpdateContent}) {
 % # preserve QuoteTransaction so we can use it to set up sane references/in/reply to
 % my $temp = $ARGS{'QuoteTransaction'};
 % delete $ARGS{'QuoteTransaction'};
-    <& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, IncludeSignature => 0, %ARGS&>
+    <& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, IncludeSignature => $IncludeSignature, %ARGS&>
 % $ARGS{'QuoteTransaction'} = $temp;
 % } else {
-% my $IncludeSignature = 1;
-% $IncludeSignature = 0 if $Action ne 'Respond' && !RT->Config->Get('MessageBoxIncludeSignatureOnComment');
     <& /Elements/MessageBox, Name=>"UpdateContent", IncludeSignature => $IncludeSignature, %ARGS &>
 % }
 % $m->callback( %ARGS, CallbackName => 'AfterMessageBox' );

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


hooks/post-receive
-- 
rt