Bugzilla – Attachment 33111 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]
[PASSED QA] Bug 10860 [QA Followup] - Use Koha.Preference
PASSED-QA-Bug-10860-QA-Followup---Use-KohaPreferen.patch (text/plain), 2.42 KB, created by
Katrin Fischer
on 2014-10-31 19:57:31 UTC
(
hide
)
Description:
[PASSED QA] Bug 10860 [QA Followup] - Use Koha.Preference
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-10-31 19:57:31 UTC
Size:
2.42 KB
patch
obsolete
>From 958d25ac51c912f123e6003b09495c74489f9b43 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 31 Oct 2014 05:31:24 -0400 >Subject: [PATCH] [PASSED QA] Bug 10860 [QA Followup] - Use Koha.Preference > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > circ/circulation.pl | 1 - > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index db21100..2a1f211 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -601,7 +601,6 @@ $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/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 956779f..a8f79c2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -499,7 +499,7 @@ No patron matched <span class="ex">[% message %]</span> > > [% IF ( borrowernumber ) %] > <div class="yui-g"> >-[% IF !noissues || onsite_checkout_forced %] >+[% IF !noissues || Koha.Preference('OnSiteCheckoutsForce') %] > [% IF ( flagged ) %] > <div class="yui-u first"> > [% ELSE %] >@@ -575,7 +575,7 @@ No patron matched <span class="ex">[% message %]</span> > [% IF ( noissues ) %]<div>[% ELSE %]<div class="yui-u">[% END %] > > [% IF flagged %] >- [% IF NOT noissues || ( noissues && onsite_checkout_forced ) %] >+ [% IF NOT noissues || ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] > <div id="circmessages" class="circmessage attention"> > [% ELSE %] > <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4> >@@ -584,7 +584,7 @@ No patron matched <span class="ex">[% message %]</span> > <h3> > [% IF noissues %] > Cannot check out! >- [% IF onsite_checkout_forced %] >+ [% IF Koha.Preference('OnSiteCheckoutsForce') %] > <span style="color:red;">Only on-site checkouts are allowed</span> > [% END %] > [% 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