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' %]