[Rt-commit] rt branch, 4.4/history-scroll-header, repushed

? sunnavy sunnavy at bestpractical.com
Mon Mar 19 18:44:42 EDT 2018


The branch 4.4/history-scroll-header was deleted and repushed:
       was 2547f51dcbc341bc74ca4762dc4775bffff6bd12
       now 3fa145c4f06d7607d20384c0dfaa639ce9e6e79d

1: 2be2cf851 ! 1: 293d3ca2e respect ShowHeaders option from request for ScrollShowHistory
    @@ -1,6 +1,8 @@
     Author: sunnavy <sunnavy at bestpractical.com>
     
         respect ShowHeaders option from request for ScrollShowHistory
    +    
    +    Fixes: I#32699
     
     diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
     --- a/share/html/Ticket/Display.html
2: 2547f51dc ! 2: 3fa145c4f fix ExtraArgs of callback ExtraShowHistoryArguments in ScrollShowHistory
    @@ -1,14 +1,12 @@
     Author: sunnavy <sunnavy at bestpractical.com>
     
    -    Fix ExtraArgs of callback ExtraShowHistoryArguments in ScrollShowHistory
    +    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.
    -    
    -    Fixes: I#32699
     
     diff --git a/share/html/Elements/ShowHistoryHeader b/share/html/Elements/ShowHistoryHeader
     --- a/share/html/Elements/ShowHistoryHeader
    @@ -23,6 +21,18 @@
                          ? loc('History')
                          : ' ';
     
    +diff --git a/share/html/Ticket/Elements/AddAttachments b/share/html/Ticket/Elements/AddAttachments
    +--- a/share/html/Ticket/Elements/AddAttachments
    ++++ b/share/html/Ticket/Elements/AddAttachments
    +@@
    +         dictDefaultMessage: <% loc("Drop files here or click to attach") |n,j %>,
    +         maxFilesize: MaxAttachmentSizeMiB,
    +         parallelUploads: 1,
    ++        forceFallback: <% RT->Config->Get('PreferDropzone', $session{CurrentUser}) ? 0 : 1 %>,
    +         previewTemplate: '' +
    +             '<div class="dz-preview dz-file-preview">' +
    +             '    <div class="dz-remove-mark pointer-events" data-dz-remove>' +
    +
     diff --git a/share/html/Ticket/Elements/ScrollShowHistory b/share/html/Ticket/Elements/ScrollShowHistory
     --- a/share/html/Ticket/Elements/ScrollShowHistory
     +++ b/share/html/Ticket/Elements/ScrollShowHistory
    @@ -31,13 +41,15 @@
              $m->comp('/Elements/QueryString', %params, id => $Ticket->id );
      
     -my %extra_args;
    -+my %extra_args = map { $ARGS{$_} // 1 } qw/ShowDisplayModes ShowTitle ScrollShowHistory ShowHeaders/;
    ++my %extra_args = map { $_ => $ARGS{$_} // 1 } qw/ShowDisplayModes ShowTitle ScrollShowHistory/;
    ++$extra_args{ShowHeaders} = $ARGS{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>
      



More information about the rt-commit mailing list