From c33adb57ff64ed24788d87c1f350888796754fa3 Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@biblibre.com> Date: Thu, 12 Sep 2013 15:56:49 +0200 Subject: [PATCH] Bug 10863: The force checkout permission should not affect high holds - typo checkout => check out. - the force checkout permission does not affect high holds. --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 10 +++------- 1 file changed, 3 insertions(+), 7 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 4125ae8..c13ee3b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -330,7 +330,7 @@ function validate1(date) { [% IF CAN_user_circulate_force_checkout %] <h3>Please confirm checkout</h3> [% ELSE %] - <h3>Cannot checkout</h3> + <h3>Cannot check out</h3> [% END %] <ul> @@ -409,11 +409,7 @@ function validate1(date) { [% END %] [% IF HIGHHOLDS %] - <li>High demand item. Loan period shortened to [% HIGHHOLDS.duration %] days (due [% HIGHHOLDS.returndate %]). - [% IF CAN_user_circulate_force_checkout %] - Check out anyway? - [% END %] - </li> + <li>High demand item. Loan period shortened to [% HIGHHOLDS.duration %] days (due [% HIGHHOLDS.returndate %]).</li> [% END %] </ul> @@ -425,7 +421,7 @@ function validate1(date) { </script> [% END %] -[% IF CAN_user_circulate_force_checkout %] +[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %] <form method="post" action="/cgi-bin/koha/circ/circulation.pl" autocomplete="off"> [% IF ( RESERVED ) %] -- 1.7.10.4