From 15c95d703fc33ce3bc5d97ff773ff4867f047804 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Mon, 19 Nov 2018 11:25:24 +0000 Subject: [PATCH] Bug 20600: (follow-up) Rebase on current master Significant things have changed in master due to ILL enhancement patches being pushed. This patch rebases this bug on top of them --- Koha/REST/V1/Illrequests.pm | 29 +- .../prog/en/modules/ill/ill-requests.tt | 541 +-------------------- 2 files changed, 35 insertions(+), 535 deletions(-) diff --git a/Koha/REST/V1/Illrequests.pm b/Koha/REST/V1/Illrequests.pm index ea2da29d13..434bc1f164 100644 --- a/Koha/REST/V1/Illrequests.pm +++ b/Koha/REST/V1/Illrequests.pm @@ -58,22 +58,6 @@ sub list { # Get all requests my @requests = Koha::Illrequests->as_list; - # Create new "formatted" columns for each date column - # that needs formatting - foreach $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 = { @@ -128,6 +112,19 @@ sub list { foreach my $req(@requests) { my $to_push = $req->unblessed; $to_push->{id_prefix} = $req->id_prefix; + # 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} = { 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 c368ce1bc1..585dac4803 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 @@ -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' %] - @@ -970,6 +459,7 @@ Updated on Request number Comments + Patron barcode @@ -995,6 +485,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]