From: Andrew Isherwood Date: Wed, 24 Apr 2019 13:58:41 +0000 (+0100) Subject: Bug 21460: (follow-up) Fix bugs found in QA X-Git-Url: http://git.equinoxoli.org/?p=koha-equinox.git;a=commitdiff_plain;h=4b97a67ae4b940cbac57f69cb47a7ae058980e6d Bug 21460: (follow-up) Fix bugs found in QA Fix silly bugs mentioned in comment #29 Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens --- diff --git a/Koha/REST/V1/Illrequests.pm b/Koha/REST/V1/Illrequests.pm index f747390..907dc5c 100644 --- a/Koha/REST/V1/Illrequests.pm +++ b/Koha/REST/V1/Illrequests.pm @@ -57,7 +57,7 @@ sub list { # Get all requests # If necessary, only get those from a specified patron my @requests = Koha::Illrequests->search({ - args->{borrowernumber} + $args->{borrowernumber} ? ( borrowernumber => $args->{borrowernumber} ) : () })->as_list; diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl index 57b0692..010c61e 100755 --- a/ill/ill-requests.pl +++ b/ill/ill-requests.pl @@ -280,8 +280,8 @@ if ( $backends_available ) { uri_escape_utf8(scalar $params->{$filter}); } } + my @tpl_arr = (); if (keys %{$active_filters}) { - my @tpl_arr; foreach my $key (keys %{$active_filters}) { push @tpl_arr, $key . "=" . $active_filters->{$key}; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index 8feeccb..88ee777 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -527,7 +527,7 @@ [% INCLUDE 'calendar.inc' %] [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]