@@ -, +, @@ --- Koha/REST/V1/Illrequests.pm | 28 +- .../prog/en/modules/ill/ill-requests.tt | 545 +-------------------- 2 files changed, 36 insertions(+), 537 deletions(-) --- a/Koha/REST/V1/Illrequests.pm +++ a/Koha/REST/V1/Illrequests.pm @@ -56,22 +56,6 @@ sub list { # Get all requests my @requests = Koha::Illrequests->as_list; - # Create new "formatted" columns for each date column - # that needs formatting - foreach my $req(@requests) { - foreach my $field(@format_dates) { - if (defined $req->{$field}) { - $req->{$field . "_formatted"} = format_sqldatetime( - $req->{$field}, - undef, - undef, - 1 - ); - } - } - - } - # Identify patrons & branches that # we're going to need and get them my $to_fetch = { @@ -125,6 +109,18 @@ sub list { my @output = (); foreach my $req(@requests) { my $to_push = $req->unblessed; + # Create new "formatted" columns for each date column + # that needs formatting + foreach my $field(@format_dates) { + if (defined $to_push->{$field}) { + $to_push->{$field . "_formatted"} = format_sqldatetime( + $to_push->{$field}, + undef, + undef, + 1 + ); + } + } foreach my $p(@{$patron_arr}) { if ($p->{borrowernumber} == $req->borrowernumber) { $to_push->{patron} = { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -7,518 +7,7 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › ILL requests [% INCLUDE 'doc-head-close.inc' %] -[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] [% Asset.css("css/datatables.css") | $raw %] -[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'calendar.inc' %] - @@ -942,6 +431,7 @@ Updated on Request number Comments + Patron barcode @@ -968,6 +458,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]