From 57c992cafab48526468aa01618d100931885023f Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Wed, 11 Sep 2013 10:17:04 +0200
Subject: [PATCH] Bug 10863: The lift restriction button should be hide on the
 moremember page

This followup fixes 3 issues:
- hide the lift restriction button on the moremember page is needed.
- typo checkout => check out.
- the force checkout permission does not affect high holds.
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt   |    8 ++------
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt |    6 ++++--
 2 files changed, 6 insertions(+), 8 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..52198b4 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>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index e674c3c..5eb37c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -194,10 +194,12 @@ function validate1(date) {
         <ul>
         [% IF ( userdebarred ) %]
             <li class="blocker">Patron is restricted[% IF ( userdebarreddate ) %] until [% userdebarreddate%] [% IF (debarredcomment ) %]([% debarredcomment %])[% END %][% END %]
-            <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
+            [% IF CAN_user_circulate_lift_restriction %]
+              <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
                 <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
                 <input type="submit" value="Lift restriction" />
-            </form>
+              </form>
+            [% END %]
             </li>
         [% END %]
         [% IF ( gonenoaddress ) %]<li class="blocker">Patron's address is in doubt.</li>[% END %]
-- 
1.7.10.4