diff --git a/installer/data/mysql/atomicupdate/bug_42344.pl b/installer/data/mysql/atomicupdate/bug_42344.pl new file mode 100755 index 0000000000..78b65d1b68 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_42344.pl @@ -0,0 +1,19 @@ +use Modern::Perl; +use Koha::Installer::Output qw(say_warning say_success say_info); + +return { + bug_number => "42344", + description => "Remove system preference 'CircSidebar'", + up => sub { + my ($args) = @_; + my ( $dbh, $out ) = @$args{qw(dbh out)}; + + $dbh->do( + q{ + DELETE FROM systempreferences + WHERE variable="CircSidebar" + } + ) == 1 + && say_success( $out, "Removed system preference 'CircSidebar'" ); + }, +}; diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 3cfcbc9fdf..a1a09d77e7 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -171,7 +171,6 @@ INSERT INTO systempreferences ( `variable`, `value` ) VALUES ('CircConfirmItemParts', '0'), ('CircControl','ItemHomeLibrary'), ('CircControlReturnsBranch','ItemHomeLibrary'), -('CircSidebar','1'), ('CirculateILL','0'), ('ClaimReturnedChargeFee', 'ask'), ('ClaimReturnedLostValue', ''), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 915614043b..3ad9402d48 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -1,11 +1,5 @@ Circulation: Interface: - - - - pref: CircSidebar - choices: - 1: Activate - 0: Deactivate - - the navigation sidebar on all circulation pages. - - pref: CircConfirmItemParts choices: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index 3583141829..527d5db7d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -166,8 +166,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Article requests

[% PROCESS urls_modal %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt index cb30349577..45dffec1ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -28,8 +28,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Overdues with fines at [% Branches.GetLoggedInBranchname | html %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index 60e2a833e7..9b7b407ac7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -54,8 +54,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %] [% IF ( found ) %] [% BLOCK transfer_hidden_fields %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index 663cb0171e..3cf8f8abe9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -32,8 +32,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Checkout notes

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 811cce33f8..9d44f1de22 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -61,7 +61,7 @@ [% END #/ WRAPPER sub-header.inc %] [% SET asides = [] %] -[% IF Koha.Preference('CircSidebar') && !( borrowernumber && patron ) %][% asides.push('circ-nav') %][% END %] +[% IF !( borrowernumber && patron ) %][% asides.push('circ-nav') %][% END %] [% IF borrowernumber && patron %][% asides.push('circ-menu') %][% END %] [% WRAPPER 'main-container.inc' asides=asides %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index bdeffec728..27907c2a4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -45,8 +45,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-menu' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-menu' %] [% IF patron %] [% INCLUDE 'members-toolbar.inc' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index e3abf04754..7c1f862f34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -699,8 +699,7 @@ [% END %] [% END # /BLOCK disabled %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %] [% IF !disabled_for_branch %] [% PROCESS curbside_pickups_enabled %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt index 0d67434b88..4768f39d9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt @@ -32,8 +32,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Pending on-site checkouts

[% IF pending_onsite_checkouts %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index e20c75ece5..c7c43cbea2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -33,8 +33,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %] [% IF error %]

Cannot renew:

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 3048b1ca71..e31678f771 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -65,8 +65,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %] [% BLOCK all_checkin_messages %] [% IF hold_auto_filled %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt index 2505e385b0..5a373f0d25 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt @@ -43,8 +43,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Set library

[% INCLUDE 'csrf-token.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt index 715a42565e..c2950c5f71 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfers_to_send.tt @@ -33,8 +33,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Transfers requested of your library as of [% show_date | $KohaDates %]

[% IF libraries.count %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt index e39312db4a..7c1306ed78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -33,8 +33,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Transfers made to your library as of [% show_date | $KohaDates %]

Your library is the destination for the following transfer(s)

[% IF ( TransfersMaxDaysWarning ) %]

Transfers are considered late after [% TransfersMaxDaysWarning | html %] days.

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index 80b1d11ca1..4fe902f9bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -61,14 +61,10 @@ [% END #/ WRAPPER sub-header.inc %] [% aside = BLOCK %] - [%~ IF ( total || Koha.Preference('CircSidebar') ) %] - [% IF ( total ) %] - [% PROCESS filter_form %] - [% END %] - [% IF Koha.Preference('CircSidebar') %] - [% INCLUDE 'circ-nav.inc' %] - [% END %] - [% END ~%] + [% IF ( total ) %] + [% PROCESS filter_form %] + [% END %] + [% INCLUDE 'circ-nav.inc' %] [% END %] [% WRAPPER 'main-container.inc' aside_block=aside %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 95c5eb54e4..34ce787dda 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -42,8 +42,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Holds awaiting pickup for your library on: [% show_date | $KohaDates %]

[% IF ( all_branches_link ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt index 0ff965b3f6..741ad52f3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_old_queue.tt @@ -29,8 +29,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Old recalls

[% IF Koha.Preference('UseRecalls') %]
[% INCLUDE 'recalls.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt index 66ad4cf289..933d08461b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_overdue.tt @@ -29,8 +29,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Overdue recalls

[% IF Koha.Preference('UseRecalls') %] [% IF recalls.count %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt index b67294627e..ced0feb94a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_queue.tt @@ -29,8 +29,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Recalls queue

[% IF Koha.Preference('UseRecalls') %] [% IF recalls.count %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt index c2a8569d4a..3663185e0a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_to_pull.tt @@ -32,8 +32,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Recalls to pull

The following recalls could be fulfilled by available items. [% IF Koha.Preference('UseRecalls') %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt index b26dee91bd..7160ac8dbc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt @@ -29,8 +29,7 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% SET aside = Koha.Preference('CircSidebar') ? 'circ-nav' : '' %] -[% WRAPPER 'main-container.inc' aside=aside %] +[% WRAPPER 'main-container.inc' aside='circ-nav' %]

Recalls awaiting pickup

[% IF Koha.Preference('UseRecalls') %]