[Rt-commit] rt branch, 4.4/history-scroll-header, created. rt-4.4.2-88-gf34a856b6

[? sunnavy]

The branch, 4.4/history-scroll-header has been created
        at  f34a856b6e6f6cd3d679c3737ba3f9235f116d9a (commit)

- Log -----------------------------------------------------------------
commit 2be2cf8518aaa3eb2c68cc67afc7c83c851e401b
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Mar 2 05:13:28 2018 +0800

    respect ShowHeaders option from request for ScrollShowHistory

diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index a6bfb85b1..58794f77f 100644
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -81,7 +81,8 @@ my $titleright = qq{<a href="$url_html" data-show-label="$show_label" data-hide-
 % my $ShowHistory = RT->Config->Get("ShowHistory", $session{'CurrentUser'});
 % if ($ShowHistory eq "scroll") {
     <& /Ticket/Elements/ScrollShowHistory,
-        Ticket => $TicketObj
+        Ticket => $TicketObj,
+        ShowHeaders => $ARGS{'ShowHeaders'},
     &>
 % } elsif ($ShowHistory eq "delay") {
     <& /Ticket/Elements/DelayShowHistory,
diff --git a/share/html/Ticket/Elements/ScrollShowHistory b/share/html/Ticket/Elements/ScrollShowHistory
index 2dff85c97..703e1da8f 100644
--- a/share/html/Ticket/Elements/ScrollShowHistory
+++ b/share/html/Ticket/Elements/ScrollShowHistory
@@ -61,7 +61,7 @@ $m->callback( CallbackName => 'ExtraShowHistoryArguments', Ticket => $Ticket, Ex
 
 my $ShowDisplayModes = 1 || $extra_args{'ShowDisplayModes'};
 my $ShowTitle =        1 || $extra_args{'ShowTitle'};
-my $ShowHeaders =      0 || $extra_args{'ShowHeaders'};
+my $ShowHeaders = $extra_args{ShowHeaders} // $ARGS{ShowHeaders};
 
 my $oldestTransactionsFirst = RT->Config->Get("OldestTransactionsFirst", $session{CurrentUser});
 </%INIT>
@@ -140,7 +140,7 @@ jQuery(function(){
         }
 
         jQuery.ajax({
-            url: "<% $url %>" + queryString,
+            url: "<% $url |n %>" + queryString,
             success: function(html) {
                 var transactions = jQuery(html).filter('div.transaction');
                 if(html && transactions.length) {

commit f34a856b6e6f6cd3d679c3737ba3f9235f116d9a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Mar 2 08:07:06 2018 +0800

    fix ExtraArgs of callback ExtraShowHistoryArguments in ScrollShowHistory
    
    Previously ShowDisplayModes and ShowTitle were always true, which made
    the callback pretty useless.
    
    ScrollShowHistory option was also wrongly ignored when determining if
    there should be a TitleBox or not.

diff --git a/share/html/Elements/ShowHistoryHeader b/share/html/Elements/ShowHistoryHeader
index 982306be7..6185111c0 100644
--- a/share/html/Elements/ShowHistoryHeader
+++ b/share/html/Elements/ShowHistoryHeader
@@ -58,7 +58,7 @@ my $histid      = "\L$record_type\E-" . $Object->id . "-history";
 </%INIT>
 <div class="history <% lc $record_type %>" id="<% $histid %>">
 <%perl>
-if ( $ShowDisplayModes or $ShowTitle ) {
+if ( $ShowDisplayModes or $ShowTitle or $ScrollShowHistory ) {
     my $title = $ShowTitle
                     ? loc('History')
                     : ' ';
diff --git a/share/html/Ticket/Elements/ScrollShowHistory b/share/html/Ticket/Elements/ScrollShowHistory
index 703e1da8f..fdb523b7d 100644
--- a/share/html/Ticket/Elements/ScrollShowHistory
+++ b/share/html/Ticket/Elements/ScrollShowHistory
@@ -56,26 +56,19 @@ delete $params{Ticket};
 my $url = RT->Config->Get('WebPath') . "/Helpers/TicketHistoryPage?" .
         $m->comp('/Elements/QueryString', %params, id => $Ticket->id );
 
-my %extra_args;
+my %extra_args = map { $ARGS{$_} // 1 } for qw/ShowDisplayModes ShowTitle ScrollShowHistory ShowHeaders/;
 $m->callback( CallbackName => 'ExtraShowHistoryArguments', Ticket => $Ticket, ExtraArgs => \%extra_args );
 
-my $ShowDisplayModes = 1 || $extra_args{'ShowDisplayModes'};
-my $ShowTitle =        1 || $extra_args{'ShowTitle'};
-my $ShowHeaders = $extra_args{ShowHeaders} // $ARGS{ShowHeaders};
-
 my $oldestTransactionsFirst = RT->Config->Get("OldestTransactionsFirst", $session{CurrentUser});
 </%INIT>
 
 <& /Elements/ShowHistoryHeader,
     Object            => $Ticket,
-    ShowHeaders       => $ShowHeaders,
-    ShowTitle         => $ShowTitle,
-    ShowDisplayModes  => $ShowDisplayModes,
-    ScrollShowHistory => 1,
+    %extra_args,
     &>
 
 </div>
-% if ($ShowDisplayModes or $ShowTitle) {
+% if ($extra_args{ShowDisplayModes} or $extra_args{ShowTitle} or $extra_args{ScrollShowHistory} ) {
     <& /Widgets/TitleBoxEnd &>
 % }
 </div>

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