From cf20544117ef21719e17bcfb05ce492bfebfc011 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 30 Oct 2014 20:33:35 +0100 Subject: [PATCH] Bug 10860: Follow-up - fix some template variable issues Fixing some simple display issues caused by missing/misnamed variables, probably consequence of the renaming before. Amended test plan: - Make sure that if OnSiteCheckoutsForce is set, you can still perform onsite checkouts and only those. - Check the detail page in staff says *currently in local use by* for an on-site checked out item - Check the detail page in OPAC with OPACShowCheckoutName active for the same. Signed-off-by: Kyle M Hall --- circ/circulation.pl | 1 + .../prog/en/modules/catalogue/detail.tt | 4 ++-- .../prog/en/modules/circ/circulation.tt | 2 +- .../bootstrap/en/includes/item-status.inc | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 497f16e..64e5e55 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -586,6 +586,7 @@ $template->param( canned_bor_notes_loop => $canned_notes, debarments => GetDebarments({ borrowernumber => $borrowernumber }), todaysdate => dt_from_string()->set(hour => 23)->set(minute => 59), + onsite_checkout_forced => C4::Context->preference("OnSiteCheckoutsForce"), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 89607ef..efd1dc4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -586,13 +586,13 @@ function verify_images() { [% IF ( item.datedue ) %] - [% IF onsite_checkout %] + [% IF item.onsite_checkout %] Currently in local use [% ELSE %] Checked out [% END %] [% UNLESS ( item.NOTSAMEBRANCH ) %] - [% IF onsite_checkout %] + [% IF item.onsite_checkout %] by [% ELSE %] to diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index febc37c..e1179d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -569,7 +569,7 @@ No patron matched [% message %] [% IF noissues %] Cannot check out! [% IF onsite_checkout_forced %] - Only on-site checkouts is allowed + Only on-site checkouts are allowed [% END %] [% ELSE %] Attention: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc index f9b27c0..f8980a6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc @@ -19,7 +19,7 @@ not use an API to fetch items that populates item.datedue. [% END %] [% END %] [% ELSIF ( item.datedue || issue.date_due ) %] - [% IF onsite_checkout %] + [% IF item.onsite_checkout %] [% IF ( OPACShowCheckoutName ) %] Currently in local use by [% item.cardnumber %] [% item.firstname %] [% item.surname %] [% ELSE %] -- 1.7.2.5