Attachment 47485 Details for Bug 15706 – Bug 15706: Changing to circulate_remaining_permissions

[patch] Bug 15706: Changing to circulate_remaining_permissions

Bug-15706-Changing-to-circulateremainingpermission.patch (text/plain), 20.91 KB, created by Aleisha Amohia on 2016-01-31 21:18:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2016-01-31 21:18:39 UTC

Size: 20.91 KB

patch

obsolete

>From d390f81c2460fbd051eaa1137ce28ae556209321 Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>Date: Sun, 31 Jan 2016 21:16:18 +0000
>Subject: [PATCH] Bug 15706: Changing to circulate_remaining_permissions
>
>I have only changed this in the includes for the tabs at the top.
>Dependent on Bug 12051 as that patch adds extra tabs to the top which would need to be changed later
>
>To test:
>1) Apply Bug 12051 first, then this patch
>2) Ensure that Check Out/Check In/Renew tabs still work as they should
>3) Check patch for errors or pages I've missed
>---
> .../intranet-tmpl/prog/en/includes/budgets-admin-search.inc    |    2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc        |    8 ++++----
> koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc |    8 ++++----
> koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc    |    6 +++---
> koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc       |    8 ++++----
> .../intranet-tmpl/prog/en/includes/cities-admin-search.inc     |    2 +-
> .../intranet-tmpl/prog/en/includes/contracts-admin-search.inc  |    2 +-
> .../intranet-tmpl/prog/en/includes/currencies-admin-search.inc |    2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc       |    8 ++++----
> koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc    |    2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc     |    8 ++++----
> .../intranet-tmpl/prog/en/includes/patrons-admin-search.inc    |    2 +-
> .../intranet-tmpl/prog/en/includes/prefs-admin-search.inc      |    2 +-
> .../intranet-tmpl/prog/en/includes/printers-admin-search.inc   |    2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc    |    2 +-
> .../intranet-tmpl/prog/en/includes/suggestions-add-search.inc  |    2 +-
> .../intranet-tmpl/prog/en/includes/z3950-admin-search.inc      |    2 +-
> 17 files changed, 34 insertions(+), 34 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>index 86d9b92..9bf4e70 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>@@ -34,7 +34,7 @@
>     </div>[% END %]
>             <ul>
>             <li><a onclick="keep_text(0)" href="#budgets_search">Search funds</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
>             </ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>index 61fefa7..1e06e69 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>@@ -4,7 +4,7 @@
> 
> [% INCLUDE 'patron-search-box.inc' %]
> 
>-[% IF ( CAN_user_circulate ) %]
>+[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="checkin_search" class="residentsearch">
>     <p class="tip">Scan a barcode to check in:</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>@@ -32,9 +32,9 @@
> [% END %]
> 
> <ul>
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
>     [% IF ( CAN_user_catalogue ) %]<li onclick="keep_text(3)" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
> </ul>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>index 1cb311e..872c86e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>@@ -12,7 +12,7 @@
> 
>         [% INCLUDE 'patron-search-box.inc' %]
> 
>-        [% IF ( CAN_user_circulate ) %]
>+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>         <div id="checkin_search" class="residentsearch">
>             <p class="tip">Scan a barcode to check in:</p>
>             <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>@@ -40,9 +40,9 @@
> 
>         <ul>
>             <li><a onclick="keep_text(0)" href="#addbooks_search">Cataloging search</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
>             <li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>
>         </ul>
>     </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>index 07cb17b..fdc1d2e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>@@ -11,7 +11,7 @@
>     </form>
> </div>
> [% END %]
>-[% IF ( CAN_user_circulate ) %]
>+[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="renew_search" class="residentsearch">
>     <p class="tip">Scan a barcode to renew:</p>
>     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>@@ -22,8 +22,8 @@
> [% END %]
> 
> <ul>
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#renew_search">Renew</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#renew_search">Renew</a></li>[% END %]
>     [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
> </ul>   
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>index 141561c..92a0685 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>@@ -3,7 +3,7 @@
> 
> <div id="header_search">
>     [% INCLUDE 'patron-search-box.inc' %]
>-[% IF ( CAN_user_circulate ) %]
>+[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="checkin_search" class="residentsearch">
>     <p class="tip">Scan a barcode to check in:</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>@@ -30,9 +30,9 @@
> [% END %]
> 
> <ul>
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
>     [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
> </ul>   
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>index 41bfdc4..3b11479 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>@@ -21,7 +21,7 @@
> 	</div>[% END %]
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#city_search">Search cities</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
> 			</ul>	
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
>index 692dfd1..c173cc4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
>@@ -23,7 +23,7 @@
> 
> 	<ul>
>             <li><a onclick="keep_text(0)" href="#contract_description_search">Search contracts</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
> 	</ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
>index cbd6e5c..759a0e2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
>@@ -19,7 +19,7 @@
> 	</div>[% END %]
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#currency_search">Search currencies</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
> 			</ul>	
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>index d1b2f9a..8c9a3b7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>@@ -3,7 +3,7 @@
> 
> <div id="header_search">
>     [% INCLUDE 'patron-search-box.inc' %]
>-[% IF ( CAN_user_circulate ) %]
>+[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="checkin_search" class="residentsearch">
>     <p class="tip">Scan a barcode to check in:</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>@@ -39,9 +39,9 @@
> </div>[% END %]
> 
> <ul>
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
>-    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
>     [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>[% END %]
>     [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
> </ul>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>index 806ee5e..dbcb0f4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>@@ -19,7 +19,7 @@
> 	</div>[% END %]
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#notices_search">Search notices</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
> 			</ul>	
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>index 5170432..4765e03 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>@@ -114,7 +114,7 @@
> </div>
>     [% INCLUDE 'patron-search-box.inc' %]
> 
>-    [% IF ( CAN_user_circulate ) %]
>+    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>     <div id="checkin_search" class="residentsearch">
>     <p class="tip">Scan a barcode to check in:</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>@@ -142,9 +142,9 @@
> 
>     <ul>
>         <li><a onclick="keep_text(0)" href="#patron_search">Search patrons</a></li>
>-        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>-        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
>-        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
>+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
>+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
>         [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
>     </ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
>index 9c15306..88215b4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
>@@ -20,7 +20,7 @@
> 
> 	<ul>
>             <li><a onclick="keep_text(0)" href="#patron_category_search">Search patron categories</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
> 			</ul>	
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
>index d11d395..b0e476f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
>@@ -22,7 +22,7 @@
> 	[% END %]
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#syspref_search">Search system preferences</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
> 			</ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
>index 46deb14..7d75a71 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
>@@ -20,7 +20,7 @@
> 	[% END %]
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#printer_search">Search printers</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
> 			</ul>	
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>index 8ba2b15..a22ff0f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>@@ -29,7 +29,7 @@
>     [% END %]
>     <ul>
>       <li><a href="#subscription_search">Search subscriptions</a></li>
>-      [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>+      [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>       [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
>     </ul>
>   </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
>index 58195c0..802853a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
>@@ -25,7 +25,7 @@
> 	[% END %]
> 			<ul>
>             <li><a href="#suggestions_search">Search suggestions</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
>             </ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>index ffd5290..d78b358 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>@@ -22,7 +22,7 @@
> 	[% END %]
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#z3950_search">Search Z39.50/SRU servers</a></li>
>-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
> 			</ul>	
> </div>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 15706: 47485 | 47486 | 47531 | 47532 | 47596 | 47786 | 47787 | 48728