From 0801fa99dc17adf1aeee98c58b2cf22a57cbb532 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Sun, 31 Jan 2016 21:16:18 +0000 Subject: [PATCH] Bug 15706: Changing to circulate_remaining_permissions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Marc VĂ©ron --- .../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 @@ [% END %] 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 ) %] [% END %] -[% IF ( CAN_user_circulate ) %] +[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] 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 @@ [% END %] 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 @@ [% END %] 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 @@ [% INCLUDE 'patron-search-box.inc' %] - [% IF ( CAN_user_circulate ) %] + [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] 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 @@ 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 %] 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 %] 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 %] 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 %] 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 %] -- 1.7.10.4