From 34cbe809e8a030a173bdc3b4d6996065bf7291c9 Mon Sep 17 00:00:00 2001 From: James O'Keeffe Date: Thu, 21 Jan 2021 01:53:05 +0000 Subject: [PATCH] Bug 27503 Work In Progress: Rename system preference virtualshelves to AllowLists --- C4/Auth.pm | 6 +++--- basket/sendbasket.pl | 2 +- catalogue/detail.pl | 2 +- catalogue/search.pl | 2 +- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- .../intranet-tmpl/prog/en/includes/js_includes.inc | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +- .../opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 2 +- .../bootstrap/en/includes/opac-detail-sidebar.inc | 2 +- .../bootstrap/en/includes/title-actions-menu.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 2 +- .../bootstrap/en/modules/opac-results-grouped.tt | 8 ++++---- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 18 +++++++++--------- opac/opac-addbybiblionumber.pl | 4 ++-- opac/opac-detail.pl | 2 +- opac/opac-downloadshelf.pl | 4 ++-- opac/opac-sendbasket.pl | 2 +- opac/opac-sendshelf.pl | 4 ++-- 21 files changed, 37 insertions(+), 37 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 675344d4a5..ac87727cd0 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -501,7 +501,7 @@ sub get_template_and_user { IntranetUserJS => C4::Context->preference("IntranetUserJS"), intranetbookbag => C4::Context->preference("intranetbookbag"), suggestion => C4::Context->preference("suggestion"), - virtualshelves => C4::Context->preference("virtualshelves"), + virtualshelves => C4::Context->preference("AllowLists"), StaffSerialIssueDisplayCount => C4::Context->preference("StaffSerialIssueDisplayCount"), EasyAnalyticalRecords => C4::Context->preference('EasyAnalyticalRecords'), LocalCoverImages => C4::Context->preference('LocalCoverImages'), @@ -592,7 +592,7 @@ sub get_template_and_user { ShowReviewer => C4::Context->preference("ShowReviewer"), ShowReviewerPhoto => C4::Context->preference("ShowReviewerPhoto"), suggestion => "" . C4::Context->preference("suggestion"), - virtualshelves => "" . C4::Context->preference("virtualshelves"), + virtualshelves => "" . C4::Context->preference("AllowLists"), OPACSerialIssueDisplayCount => C4::Context->preference("OPACSerialIssueDisplayCount"), OPACXSLTDetailsDisplay => C4::Context->preference("OPACXSLTDetailsDisplay"), OPACXSLTResultsDisplay => C4::Context->preference("OPACXSLTResultsDisplay"), @@ -1302,7 +1302,7 @@ sub checkauth { shibbolethAuthentication => $shib, SessionRestrictionByIP => C4::Context->preference("SessionRestrictionByIP"), suggestion => C4::Context->preference("suggestion"), - virtualshelves => C4::Context->preference("virtualshelves"), + virtualshelves => C4::Context->preference("AllowLists"), LibraryName => "" . C4::Context->preference("LibraryName"), LibraryNameTitle => "" . $LibraryNameTitle, opacuserlogin => C4::Context->preference("opacuserlogin"), diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index 9e273b1f45..0bde4c6e02 100755 --- a/basket/sendbasket.pl +++ b/basket/sendbasket.pl @@ -164,7 +164,7 @@ else { bib_list => $bib_list, url => "/cgi-bin/koha/basket/sendbasket.pl", suggestion => C4::Context->preference("suggestion"), - virtualshelves => C4::Context->preference("virtualshelves"), + virtualshelves => C4::Context->preference("AllowLists"), csrf_token => Koha::Token->new->generate_csrf({ session_id => scalar $query->cookie('CGISESSID'), }), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 9cb607b1e1..8e82bab2dc 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -527,7 +527,7 @@ $template->param( # Lists -if (C4::Context->preference("virtualshelves") ) { +if (C4::Context->preference("AllowLists") ) { my $shelves = Koha::Virtualshelves->search( { biblionumber => $biblionumber, diff --git a/catalogue/search.pl b/catalogue/search.pl index d354a40eeb..7567cae237 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -304,7 +304,7 @@ if ( $template_type eq 'advsearch' ) { $template->param( expanded_options => $expanded ); } - $template->param(virtualshelves => C4::Context->preference("virtualshelves")); + $template->param(virtualshelves => C4::Context->preference("AllowLists")); output_html_with_http_headers $cgi, $cookie, $template->output; exit; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index d55c57cdff..15c075591b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -118,7 +118,7 @@ CAN_user_serials_create_subscription ) %] [% END %] [% END %] - [% IF Koha.Preference('virtualshelves') %] + [% IF Koha.Preference('AllowLists') %]
[% END %] - [% IF Koha.Preference('virtualshelves') %] + [% IF Koha.Preference('AllowLists') %]
- [% IF ( ( Koha.Preference( 'opacbookbag' ) == 1 ) || ( Koha.Preference( 'virtualshelves' ) == 1 ) ) %] + [% IF ( ( Koha.Preference( 'opacbookbag' ) == 1 ) || ( Koha.Preference( 'AllowLists' ) == 1 ) ) %]
Unhighlight @@ -244,11 +244,11 @@ [% END %] [% END %] - [% IF ( ( Koha.Preference( 'opacbookbag' ) == 1 ) || ( Koha.Preference( 'virtualshelves' ) == 1 ) ) %] + [% IF ( ( Koha.Preference( 'opacbookbag' ) == 1 ) || ( Koha.Preference( 'AllowLists' ) == 1 ) ) %] [% END %] + [% IF ( ( Koha.Preference( 'opacbookbag' ) = 1 ) || ( Koha.Preference( 'AllowLists' ) == 1 ) ) %][% END %] [% IF ( GROUP_RESULT.classification ) %] [% GROUP_RESULT.classification | html %] [% END %] @@ -304,7 +304,7 @@ }); $("span.clearall").html("" + _("Clear all") + ""); $("span.checkall").html("" + _("Select all") + ""); - $("span.addto").html(" "); + $("span.addto").html(" "); $("#addto").change(function(){ cartList(); }); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 26d3db9f8a..becfbf99bb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -218,7 +218,7 @@ | - [% IF ( ( Koha.Preference( 'opacbookbag' ) == 1 ) || ( Koha.Preference( 'virtualshelves' ) == 1 ) ) %] + [% IF ( ( Koha.Preference( 'opacbookbag' ) == 1 ) || ( Koha.Preference( 'AllowLists' ) == 1 ) ) %] [% END %] @@ -257,7 +257,7 @@ [% IF Koha.Preference( 'opacbookbag' ) == 1 %] [% ELSE %] - [% IF Koha.Preference( 'virtualshelves' ) == 1 %] + [% IF Koha.Preference( 'AllowLists' ) == 1 %] [% ELSE %] [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %] @@ -529,7 +529,7 @@
[% END %] - [% IF Koha.Preference('virtualshelves') AND SEARCH_RESULT.shelves.count %] + [% IF Koha.Preference('AllowLists') AND SEARCH_RESULT.shelves.count %]
Lists: