Attachment 139436 Details for Bug 31401 – Bug 31401: Update administration sidebar to match entries on administration start page

[patch] Bug 31401: Update administration sidebar to match entries on administration start page

Bug-31401-Update-administration-sidebar-to-match-e.patch (text/plain), 7.84 KB, created by Katrin Fischer on 2022-08-18 21:32:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-08-18 21:32:01 UTC

Size: 7.84 KB

patch

obsolete

>From 87ebc31fc9a45f92b60033aad680c441c2dfde97 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Thu, 18 Aug 2022 21:26:54 +0000
>Subject: [PATCH] Bug 31401: Update administration sidebar to match entries on
> administration start page
>
>This makes sure that all entries on the administration start page
>have a matching entry in the administration sidebar that shows
>on the left side if you are on any of the administration sub pages.
>
>Changes made:
>* Rename 'Classification sources' to 'Classification configuration'
>* Make Plugins entry show and appear in correct spot
>  This relied on the variable plugins_enabled that wasn't available
>  in all the different templates. I therefore moved it to Auth.pm
>  and cleaned up the code for the admin start page.
>* Move 'MARC overlay rules' and rename to 'Record overlay rules'
>
>To test:
>* Make sure plugins are enabled and visible on admin start page
>* Compare admin start page and sidebar
>  * Sequence should be the same
>  * All entries should appear on both pages
>  * Naming should be the same
>---
> C4/Auth.pm                                    |  3 ++-
> admin/admin-home.pl                           |  2 --
> .../prog/en/includes/admin-menu.inc           | 25 +++++++++----------
> 3 files changed, 14 insertions(+), 16 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index a2b1b84aea..bb80264e45 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -523,7 +523,7 @@ sub get_template_and_user {
>         $template->param(
>             AmazonCoverImages                                                          => C4::Context->preference("AmazonCoverImages"),
>             AutoLocation                                                               => C4::Context->preference("AutoLocation"),
>-            PatronAutoComplete                                                       => C4::Context->preference("PatronAutoComplete"),
>+            PatronAutoComplete                                                         => C4::Context->preference("PatronAutoComplete"),
>             FRBRizeEditions                                                            => C4::Context->preference("FRBRizeEditions"),
>             IndependentBranches                                                        => C4::Context->preference("IndependentBranches"),
>             IntranetNav                                                                => C4::Context->preference("IntranetNav"),
>@@ -548,6 +548,7 @@ sub get_template_and_user {
>             UseCourseReserves                                                          => C4::Context->preference("UseCourseReserves"),
>             useDischarge                                                               => C4::Context->preference('useDischarge'),
>             pending_checkout_notes                                                     => Koha::Checkouts->search({ noteseen => 0 }),
>+            plugins_enabled                                                            => C4::Context->config("enable_plugins"),
>         );
>     }
>     else {
>diff --git a/admin/admin-home.pl b/admin/admin-home.pl
>index 73f2cc8edf..6595841e70 100755
>--- a/admin/admin-home.pl
>+++ b/admin/admin-home.pl
>@@ -24,7 +24,6 @@ use Koha::Plugins;
> 
> my $query = CGI->new;
> 
>-my $plugins_enabled = C4::Context->config("enable_plugins");
> my $mana_url        = C4::Context->config('mana_config');
> 
> my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>@@ -36,7 +35,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>     }
> );
> 
>-$template->param( plugins_enabled => $plugins_enabled, );
> $template->param( mana_url        => $mana_url, );
> 
> output_html_with_http_headers $query, $cookie, $template->output;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>index 244f5acf5c..953bd7e989 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>@@ -70,6 +70,13 @@
>             [% END %]
>         </ul>
>     [% END %]
>+    
>+    [% IF CAN_user_plugins && plugins_enabled %]
>+      <h5>Plugins</h5>
>+        <ul>
>+            <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a></li>
>+        </ul>
>+    [% END %]
> 
>     [% IF CAN_user_parameters_manage_background_jobs %]
>         <h5>Background jobs</h5>
>@@ -78,7 +85,7 @@
>         </ul>
>     [% END %]
> 
>-    [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config || CAN_user_parameters_manage_marc_overlay_rules ) %]
>+    [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config || CAN_user_parameters_manage_marc_overlay_rules || CAN_user_parameters_manage_marc_overlay_rules ) %]
>         <h5>Catalog</h5>
>         <ul>
>             [% IF ( CAN_user_parameters_manage_marc_frameworks ) %]
>@@ -90,11 +97,14 @@
>                 <li><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></li>
>             [% END %]
>             [% IF ( CAN_user_parameters_manage_classifications ) %]
>-                <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></li>
>+                <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification configuration</a></li>
>             [% END %]
>             [% IF ( CAN_user_parameters_manage_matching_rules ) %]
>                 <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li>
>             [% END %]
>+            [% IF ( CAN_user_parameters_manage_marc_overlay_rules ) %]
>+                <li><a href="/cgi-bin/koha/admin/marc-overlay-rules.pl">Record overlay rules</a></li>
>+            [% END %]
>             [% IF ( CAN_user_parameters_manage_oai_sets ) %]
>                 <li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></li>
>             [% END %]
>@@ -104,15 +114,11 @@
>             [% IF ( CAN_user_parameters_manage_search_engine_config ) %]
>                 <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration (Elasticsearch)</a></li>
>             [% END %]
>-            [% IF ( CAN_user_parameters_manage_marc_overlay_rules ) %]
>-                <li><a href="/cgi-bin/koha/admin/marc-overlay-rules.pl">MARC overlay rules</a></li>
>-            [% END %]
>         </ul>
>     [% END %]
> 
>     [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) %]
>         <h5>Acquisition parameters</h5>
>-
>         <ul>
>             [% IF ( CAN_user_acquisition_currencies_manage ) %]
>                 <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
>@@ -130,13 +136,6 @@
>         </ul>
>     [% END %]
> 
>-    [% IF CAN_user_plugins && plugins_enabled %]
>-        <h5>Plugins</h5>
>-        <ul>
>-            <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">Manage plugins</a></li>
>-        </ul>
>-    [% END %]
>-
>     [% IF ( CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %]
>         <h5>Additional parameters</h5>
>         <ul>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31401: 139436 | 139445 | 140151 | 140152