Bug 42344: Remove CircSidebar

Test plan: Run the updatedatabase script and notice that the sidebar is visible in the circulation module but that you can hide/collapse it on demand. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov> Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
2026-04-13 12:27:07 +02:00 · 2026-04-13 12:27:07 +02:00 · 9d0f7d2f3c
parent 35004269a4
commit 9d0f7d2f3c
23 changed files with 42 additions and 52 deletions
--- a/installer/data/mysql/atomicupdate/bug_42344.pl
+++ 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'" );
+    },
+};
--- 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', ''),
--- 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:
--- 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' %]
    <h1>Article requests</h1>
    [% PROCESS urls_modal %]

--- 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' %]
    <h1>Overdues with fines at [% Branches.GetLoggedInBranchname | html %]</h1>

    <form name="selectlocation" action="branchoverdues.pl" method="get">
--- 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 %]
--- 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' %]
    <h1>Checkout notes</h1>

    <div class="alert alert-warning" id="error" style="display:none;"></div>
--- 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 %]

--- 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 %]
--- 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 %]
--- 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' %]
    <h1>Pending on-site checkouts</h1>
    [% IF pending_onsite_checkouts %]
        <div class="page-section">
--- 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 %]
        <div class="dialog alert alert-warning">
            <h1>Cannot renew:</h1>
--- 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 %]
--- 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' %]
    <h1>Set library</h1>
    <form method="post" action="/cgi-bin/koha/circ/set-library.pl" id="set-library-form">
        [% INCLUDE 'csrf-token.inc' %]
--- 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' %]
    <h1>Transfers requested of your library as of [% show_date | $KohaDates %]</h1>

    [% IF libraries.count %]
--- 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' %]
    <h1>Transfers made to your library as of [% show_date | $KohaDates %]</h1>
    <p>Your library is the destination for the following transfer(s)</p>
    [% IF ( TransfersMaxDaysWarning ) %]<p>Transfers are <span class="error">considered late</span> after [% TransfersMaxDaysWarning | html %] days.</p>[% END %]
--- 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 %]
--- 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' %]
    <h1>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]</h1>
    <h2>
        [% IF ( all_branches_link ) %]
--- 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' %]
    <h1>Old recalls</h1>
    [% IF Koha.Preference('UseRecalls') %]
        <div class="page-section"> [% INCLUDE 'recalls.inc' %] </div>
--- 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' %]
    <h1>Overdue recalls</h1>
    [% IF Koha.Preference('UseRecalls') %]
        [% IF recalls.count %]
--- 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' %]
    <h1>Recalls queue</h1>
    [% IF Koha.Preference('UseRecalls') %]
        [% IF recalls.count %]
--- 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' %]
    <h1>Recalls to pull</h1>
    The following recalls could be fulfilled by available items.
    [% IF Koha.Preference('UseRecalls') %]
--- 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' %]
    <h1>Recalls awaiting pickup</h1>

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