From f4bcd98d9a2eab285b0280b4eae77987e053fcf3 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=utf8 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 Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../prog/en/includes/budgets-admin-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/cataloging-search.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/checkin-search.inc | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc | 8 ++++---- .../prog/en/includes/cities-admin-search.inc | 2 +- .../prog/en/includes/contracts-admin-search.inc | 2 +- .../prog/en/includes/currencies-admin-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc | 8 ++++---- .../intranet-tmpl/prog/en/includes/letters-search.inc | 2 +- .../intranet-tmpl/prog/en/includes/patron-search.inc | 8 ++++---- .../prog/en/includes/patrons-admin-search.inc | 2 +- .../intranet-tmpl/prog/en/includes/prefs-admin-search.inc | 2 +- .../prog/en/includes/printers-admin-search.inc | 2 +- .../intranet-tmpl/prog/en/includes/serials-search.inc | 2 +- .../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 86d9b92ce3..9bf4e70a43 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 61fefa7aca..1e06e69af7 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 cbd6e5cc2f..759a0e2cf0 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 d1b2f9aeca..8c9a3b7450 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 517043254b..4765e030d3 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 9c15306353..88215b4797 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 34de2d4b1c..f8c70aca1e 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 46deb14e09..7d75a71b4b 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 8ba2b1558c..a22ff0f6ca 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 58195c0210..802853a2d0 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 ffd5290d8f..d78b35870a 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 %] -- 2.39.5