From 75c419c0ec865c0ab0784131015c3bde1e013610 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 31 Oct 2014 11:50:35 -0400 Subject: [PATCH] [PASSED QA] Bug 13179 - Circulation page layout problem when OnSiteCheckoutsForce is enabled The circulation page layout needs to work correctly for various combinations of restrictions, no restrictions, and restrictions with OnSiteCheckoutsForce enabled. This patch makes some minor accomodation for all. To test, load a patron for checkout under the following conditions: 1. OnSiteCheckoutsForce and patron is not blocked from checkout 2. OnSiteCheckoutsForce is off, patron is blocked from checkout (for being expired or restricted). 3. OnSiteCheckoutsForce is on and patron is not blocked from checkout 4. OnSiteCheckoutsForce is on and patron is blocked from checkout The page layout should look correct for all these cases, with a clean two-column layout of [ checkout form | messages ] in all cases except Signed-off-by: Brendan Gallagher Signed-off-by: Katrin Fischer Applied on top of 10860. Works as described. --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 a8f79c2..0779a5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -572,7 +572,15 @@ No patron matched [% message %] [% END %] -[% IF ( noissues ) %]
[% ELSE %]
[% END %] +[% IF ( noissues ) %] + [% IF ( Koha.Preference('OnSiteCheckoutsForce') ) %] +
+ [% ELSE %] +
+ [% END %] +[% ELSE %] +
+[% END %] [% IF flagged %] [% IF NOT noissues || ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] @@ -585,7 +593,7 @@ No patron matched [% message %] [% IF noissues %] Cannot check out! [% IF Koha.Preference('OnSiteCheckoutsForce') %] - Only on-site checkouts are allowed + Only on-site checkouts are allowed [% END %] [% ELSE %] Attention: -- 1.9.1