[Rt-commit] rt branch, 4.6/reverse-transaction-order, repushed

Michel Rodriguez michel at bestpractical.com
Wed Apr 8 07:29:17 EDT 2020


The branch 4.6/reverse-transaction-order was deleted and repushed:
       was a28284c05e637f718c07455b89f9db50f5200fe7
       now 394f5421c9353c1f58c5ea49ae5f749947ff26b2

-:  ------- > 1: 675bcecd4c Use $ShowHeaders in all templates.
1: a28284c05e ! 2: 394f5421c9 Add a control to reverse the current time order in ticket history
    @@ -67,7 +67,6 @@
     +    my $TransactionHeader= $TransactionHeaders[$Order];
     +
     +    my $switched_order = 1 - $ReverseTransactionOrder;
    -+    $ShowHeaders //= 0; # by default $ShowHeaders should be 0, but it is not
     +    push( @elements, qq{<a href="?ReverseTransactionOrder=$switched_order;ForceShowHistory=1;ShowHeaders=$ShowHeaders;id=} .
     +                     $Object->id.qq{#$histid">} .
     +                     $TransactionHeader .
    @@ -95,9 +94,9 @@
     --- a/share/html/Helpers/TicketHistory
     +++ b/share/html/Helpers/TicketHistory
     @@
    - %# END BPS TAGGED BLOCK }}}
      <%ARGS>
      $id
    + $ShowHeaders => 0
     +$ReverseTransactionOrder => 0
      </%ARGS>
      <%INIT>
    @@ -105,23 +104,11 @@
     @@
      <& /Elements/ShowHistory,
          Object => $TicketObj,
    -     ShowHeaders => $ARGS{'ShowHeaders'},
    +     ShowHeaders => $ShowHeaders,
     +    ReverseTransactionOrder => $ReverseTransactionOrder,
          Attachments => $attachments,
          AttachmentContent => $attachment_content,
          %extra_args,
    -
    -diff --git a/share/html/Helpers/TicketHistoryPage b/share/html/Helpers/TicketHistoryPage
    ---- a/share/html/Helpers/TicketHistoryPage
    -+++ b/share/html/Helpers/TicketHistoryPage
    -@@
    - <& /Elements/ShowHistoryPage,
    -     Object => $TicketObj,
    -     ShowHeaders => $ARGS{'ShowHeaders'},
    -+    ReverseTransactionOrder => $ARGS{'ReverseTransactionOrder'},
    -     Transactions => $transactions,
    -     %extra_args,
    -     &>
     
     diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
     --- a/share/html/Ticket/Display.html
    @@ -129,26 +116,26 @@
     @@
          <& /Ticket/Elements/ScrollShowHistory,
              Ticket => $TicketObj,
    -         ShowHeaders => $ARGS{'ShowHeaders'},
    +         ShowHeaders => $ShowHeaders,
     +        ReverseTransactionOrder => $ReverseTransactionOrder,
          &>
      % } elsif ($ShowHistory eq "delay") {
          <& /Ticket/Elements/DelayShowHistory,
              Ticket => $TicketObj,
    -         ShowHeaders => $ARGS{'ShowHeaders'},
    +         ShowHeaders => $ShowHeaders,
     +        ReverseTransactionOrder => $ReverseTransactionOrder,
          &>
      % } elsif (not $ForceShowHistory and $ShowHistory eq "click") {
          <& /Ticket/Elements/ClickToShowHistory,
              Ticket => $TicketObj,
    -         ShowHeaders => $ARGS{'ShowHeaders'},
    +         ShowHeaders => $ShowHeaders,
     +        ReverseTransactionOrder => $ReverseTransactionOrder,
          &>
      % } else {
          <& /Elements/ShowHistory ,
                Object => $TicketObj,
                Transactions => $transactions,
    -           ShowHeaders => $ARGS{'ShowHeaders'},
    +           ShowHeaders => $ShowHeaders,
     +          ReverseTransactionOrder => $ReverseTransactionOrder,
                Attachments => $attachments,
                AttachmentContent => $attachment_content
    @@ -175,9 +162,9 @@
     --- a/share/html/Ticket/Elements/ScrollShowHistory
     +++ b/share/html/Ticket/Elements/ScrollShowHistory
     @@
    - %# END BPS TAGGED BLOCK }}}
      <%ARGS>
      $Ticket
    + $ShowHeaders => 0
     +$ReverseTransactionOrder => 0
      </%ARGS>
      
    @@ -185,7 +172,7 @@
     @@
      
      my %extra_args = map { $_ => $ARGS{$_} // 1 } qw/ShowDisplayModes ShowTitle ScrollShowHistory/;
    - $extra_args{ShowHeaders} = $ARGS{ShowHeaders};
    + $extra_args{ShowHeaders} = $ShowHeaders;
     +$extra_args{ReverseTransactionOrder} = $ReverseTransactionOrder;
      
      $m->callback( CallbackName => 'ExtraShowHistoryArguments', Ticket => $Ticket, ExtraArgs => \%extra_args );



More information about the rt-commit mailing list