From 2561a912efd3b0f811c01229cd488441b907435a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 19 Aug 2019 18:09:58 -0400 Subject: [PATCH] Bug 23273: Fix CSV export for overdues We should construct the URI parameters string manually to avoid filtering problems. We cannot send the full query_string to the template and expect that the string will be escaped correctly. Test plan: - go to overdues.pl - construct a search limiting by date due and library - note number of overdues in results - click "Download file of displayed overdues" => note that downloaded file contains just those in your search Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit b8f382b82172b70166db48d572f767b06a4834ef) Signed-off-by: Fridolin Somers --- circ/overdue.pl | 30 ++++++++++++------- .../prog/en/modules/circ/overdue.tt | 18 ++++++----- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/circ/overdue.pl b/circ/overdue.pl index 0b6f0f802a..f5683bda22 100755 --- a/circ/overdue.pl +++ b/circ/overdue.pl @@ -39,16 +39,30 @@ my $borflagsfilter = $input->param('borflag') || ''; my $branchfilter = $input->param('branch') || ''; my $homebranchfilter = $input->param('homebranch') || ''; my $holdingbranchfilter = $input->param('holdingbranch') || ''; +my $dateduefrom = $input->param('dateduefrom'); +my $datedueto = $input->param('datedueto'); my $op = $input->param('op') || ''; -my ($dateduefrom, $datedueto); -if ( $dateduefrom = $input->param('dateduefrom') ) { +if ( $dateduefrom ) { $dateduefrom = dt_from_string( $dateduefrom ); } -if ( $datedueto = $input->param('datedueto') ) { +if ( $datedueto ) { $datedueto = dt_from_string( $datedueto )->set_hour(23)->set_minute(59); } +my $filters = { + itemtype => $itemtypefilter, + borname => $bornamefilter, + borcat => $borcatfilter, + itemtype => $itemtypefilter, + borflag => $borflagsfilter, + branch => $branchfilter, + homebranch => $homebranchfilter, + holdingbranch => $holdingbranchfilter, + dateduefrom => $dateduefrom, + datedueto => $datedueto, +}; + my $isfiltered = $op =~ /apply/i && $op =~ /filter/i; my $noreport = C4::Context->preference('FilterBeforeOverdueReport') && ! $isfiltered && $op ne "csv"; @@ -179,18 +193,14 @@ if (@patron_attr_filter_loop) { } +use Data::Printer colored => 1; warn p $filters; $template->param( patron_attr_header_loop => [ map { { header => $_->{description} } } grep { ! $_->{isclone} } @patron_attr_filter_loop ], - branchfilter => $branchfilter, - homebranchfilter => $homebranchfilter, - holdingbranchfilter => $holdingbranchfilter, + filters => $filters, borcatloop=> \@borcatloop, itemtypeloop => \@itemtypeloop, patron_attr_filter_loop => \@patron_attr_filter_loop, - borname => $bornamefilter, showall => $showall, - dateduefrom => $dateduefrom, - datedueto => $datedueto, ); if ($noreport) { @@ -346,10 +356,8 @@ if ($noreport) { # generate parameter list for CSV download link my $new_cgi = CGI->new($input); $new_cgi->delete('op'); - my $csv_param_string = $new_cgi->query_string(); $template->param( - csv_param_string => $csv_param_string, todaysdate => output_pref($today_dt), overdueloop => \@overduedata, nnoverdue => scalar(@overduedata), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index ad0d0594b8..0649d944a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -34,7 +34,11 @@

[% IF ( isfiltered ) %] - Download file of displayed overdues + [% SET url_params = '' %] + [% FOR var IN filters.keys %] + [% url_params = BLOCK %][% url_params %]&[% var | uri %]=[% filters.$var | uri %][% END %] + [% END %] + Download file of displayed overdues [% ELSE %] Download file of all overdues [% END %] @@ -102,15 +106,15 @@

Date due:
  1. - +
  2. - +
    -
    2. +
  3. - [% PROCESS options_for_libraries libraries => Branches.all( selected => homebranchfilter ) %] + [% PROCESS options_for_libraries libraries => Branches.all( selected => filters.homebranch ) %]
    4. @@ -175,7 +179,7 @@ @@ -183,7 +187,7 @@ -- 2.39.5