gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 21460: (follow-up) Filter params in .pl 

This patch filters the passed parameters in the .pl, rather than doing
it in the template. As per comment 16
(https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21460#c16)

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Andrew Isherwood 2019-04-23 10:18:31 +01:00 committed by Nick Clemens
parent 3255525b59
commit 951b857a97
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ill/ill-requests.pl
View File

@ -30,6 +30,7 @@ use Koha::Libraries;
use Koha::Token;
use Try::Tiny;
use URI::Escape;
our $cgi = CGI->new;
my $illRequests = Koha::Illrequests->new;
@ -270,18 +271,24 @@ if ( $backends_available ) {
# If we receive a pre-filter, make it available to the template
my $possible_filters = ['borrowernumber'];
my $active_filters = [];
my $active_filters = {};
foreach my $filter(@{$possible_filters}) {
if ($params->{$filter}) {
push @{$active_filters}, "$filter=$params->{$filter}";
# We shouldn't need to escape $filter here since we're using
# a whitelist, but just to be sure...
$active_filters->{uri_escape_utf8($filter)} =
uri_escape_utf8(scalar $params->{$filter});
}
}
if (scalar @{$active_filters} > 0) {
$template->param(
prefilters => join(",", @{$active_filters})
);
if (keys %{$active_filters}) {
my @tpl_arr;
foreach my $key (keys %{$active_filters}) {
push @tpl_arr, $key . "=" . $active_filters->{$key};
}
}
$template->param(
prefilters => join("&", @tpl_arr)
);
} elsif ( $op eq "save_comment" ) {
die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
session_id => scalar $cgi->cookie('CGISESSID'),

2
koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
View File

@ -527,7 +527,7 @@
[% INCLUDE 'calendar.inc' %]
[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
<script>
var prefilters = '[% prefilters | html %]';
var prefilters = '[% prefilters %]';
// Set column settings
var columns_settings = [% ColumnsSettings.GetColumns( 'illrequests', 'ill-requests', 'ill-requests', 'json' ) %];
</script>