Bugzilla – Attachment 33110 Details for
Bug 10860
On-site checkouts (was In-House Use)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10860: Follow-up - fix some template variable issues
Bug-10860-Follow-up---fix-some-template-variable-i.patch (text/plain), 4.10 KB, created by
Katrin Fischer
on 2014-10-31 19:57:26 UTC
(
hide
)
Description:
Bug 10860: Follow-up - fix some template variable issues
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-10-31 19:57:26 UTC
Size:
4.10 KB
patch
obsolete
>From 0263b5373125ad28db38ad2ed0ed61b6d4a936f5 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >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 <kyle@bywatersolutions.com> >--- > circ/circulation.pl | 1 + > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- > koha-tmpl/opac-tmpl/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 2a1f211..db21100 100755 >--- a/circ/circulation.pl >+++ b/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; >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() { > <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 %]"> >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 c6b72a0..956779f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/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: >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.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10860
:
20959
|
20960
|
20961
|
21195
|
21642
|
22461
|
26089
|
26114
|
26123
|
26185
|
26191
|
26192
|
31388
|
31507
|
31548
|
31664
|
31665
|
32213
|
32214
|
32216
|
32223
|
32579
|
32580
|
32581
|
32954
|
32979
|
32980
|
32981
|
32982
|
32983
|
32984
|
32997
|
32998
|
33031
|
33032
|
33033
|
33034
|
33035
|
33036
|
33037
|
33105
|
33106
|
33107
|
33108
|
33109
| 33110 |
33111
|
33163
|
33165