[Rt-commit] rt branch, 4.2/clean-jumbo-message-box, created. rt-4.0.4-391-g7d90721

Kevin Falcone falcone at bestpractical.com
Fri Feb 3 19:52:11 EST 2012


The branch, 4.2/clean-jumbo-message-box has been created
        at  7d9072139cf0ced96f79f4bfba96355d1f2cccd4 (commit)

- Log -----------------------------------------------------------------
commit 5874750cc670c581b8da611d31e0f8aa346fdb49
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Feb 3 19:49:11 2012 -0500

    Revert "should clear the message box if the message is recorded already"
    
    This reverts commit d9379418fe0feb08f8446d89fac789ea9bebab3f.
    This leaves the test file added in this commit, since we have a better
    fix up next.

diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index 8619cd5..c2714bc 100755
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -112,7 +112,7 @@
   <tr>
     <td class="labeltop"><&|/l&>Content</&>:</td>
     <td class="entry">
-% if (defined $ARGS{UpdateContent} && length($ARGS{UpdateContent} && !grep { /Message recorded/ } @results )) {
+% if (defined $ARGS{UpdateContent} && length($ARGS{UpdateContent})) {
     <& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, IncludeSignature => 0 &>
 % } else {
     <& /Elements/MessageBox, Name=>"UpdateContent", QuoteTransaction=>$ARGS{QuoteTransaction} &>

commit 7d9072139cf0ced96f79f4bfba96355d1f2cccd4
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Mar 2 14:52:50 2011 +0300

    redirect if we have results
    
    * refresh doesn't re-submit update
    * message box gets cleaned

diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index c2714bc..7db9586 100755
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -214,6 +214,12 @@ unless ($OnlySearchForPeople or $OnlySearchForGroup or $ARGS{'AddMoreAttach'} )
 
 $Ticket->ApplyTransactionBatch;
 
+MaybeRedirectForResults(
+    Actions   => \@results,
+    Path      => "/Ticket/ModifyAll.html",
+    Arguments => { id => $Ticket->id },
+);
+
 # If they've gone and moved the ticket to somewhere they can't see, etc...
 # TODO: display the results, even if we can't display the ticket.
 

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


More information about the Rt-commit mailing list