Browse Source

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 <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
3.18.x
Katrin Fischer 8 years ago
committed by Tomas Cohen Arazi
parent
commit
0402e4e636
  1. 1
      circ/circulation.pl
  2. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
  3. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
  4. 2
      koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc

1
circ/circulation.pl

@ -601,6 +601,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;

4
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt

@ -586,13 +586,13 @@ function verify_images() {
<td class="status">
[% IF ( item.datedue ) %]
[% IF onsite_checkout %]
[% IF item.onsite_checkout %]
<span>Currently in local use
[% ELSE %]
<span class="datedue">Checked out
[% END %]
[% UNLESS ( item.NOTSAMEBRANCH ) %]
[% IF onsite_checkout %]
[% IF item.onsite_checkout %]
by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]">
[% ELSE %]
to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber %]">

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt

@ -585,7 +585,7 @@ No patron matched <span class="ex">[% message %]</span>
[% IF noissues %]
Cannot check out!
[% IF onsite_checkout_forced %]
<span style="color:red;">Only on-site checkouts is allowed</span>
<span style="color:red;">Only on-site checkouts are allowed</span>
[% END %]
[% ELSE %]
Attention:

2
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 %]

Loading…
Cancel
Save