From a1d4e3a689fd3442e67ba7bdffbcc119ef95521a Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 22 Apr 2024 09:25:08 -0300 Subject: [PATCH] Bug 35919: (QA follow-up) Address QA concerns This patch: * Adds the missing entry in permissions.inc * Moves the configuration entry above 'Record overlay rules' * Adds the 'Record sources' link to the left navigation column, in the right position. * Makes the element be constructed the same way the 'cities' page is. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> --- koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc | 3 +++ koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 6 ++++++ .../intranet-tmpl/prog/en/modules/admin/admin-home.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/admin/record_sources.tt | 8 +++++--- 4 files changed, 18 insertions(+), 7 deletions(-) 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 c7caffc014..3aa5b87b95 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -104,6 +104,9 @@ [% 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_record_sources ) %] + <li><a href="/cgi-bin/koha/admin/record_sources">Record sources</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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc index c5ad0c54a9..b4e05e2dda 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc @@ -877,5 +877,11 @@ Manage identity providers </span> <span class="permissioncode">([% name | html %])</span> + [%# record_sources %] + [%- CASE 'manage_record_sources' -%] + <span class="sub_permission manage_record_sources_subpermission"> + Manage record sources + </span> + <span class="permissioncode">([% name | html %])</span> [%- END -%] [%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 565d9a4617..edffefba2b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -198,6 +198,10 @@ <dt><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></dt> <dd>Manage rules for automatically matching MARC records during record imports</dd> [% END %] + [% IF ( CAN_user_parameters_manage_record_sources ) %] + <dt><a href="/cgi-bin/koha/admin/record_sources">Record sources</a></dt> + <dd>Define record sources to import from</dd> + [% END %] [% IF ( CAN_user_parameters_manage_marc_overlay_rules ) %] <dt><a href="/cgi-bin/koha/admin/marc-overlay-rules.pl">Record overlay rules</a></dt> <dd>Managed rules for automatic overlay of MARC fields during record imports and updates</dd> @@ -218,10 +222,6 @@ <dt><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration (Elasticsearch)</a></dt> <dd>Manage indexes, facets, and their mappings to MARC fields and subfields</dd> [% END %] - [% IF ( CAN_user_parameters_manage_record_sources ) %] - <dt><a href="/cgi-bin/koha/admin/record_sources">Record sources</a></dt> - <dd>Define record sources to import from</dd> - [% END %] </dl> [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/record_sources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/record_sources.tt index 533a171ec2..3ceff70493 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/record_sources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/record_sources.tt @@ -7,9 +7,11 @@ [% SET footerjs = 1 %] [% PROCESS 'i18n.inc' %] [% INCLUDE 'doc-head-open.inc' %] -<title> - Record sources › Koha - +[% FILTER collapse %] + [% t("Record sources") | html %] › + [% t("Administration") | html %] › + [% t("Koha") | html %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] -- 2.39.2