Attachment 163779 Details for Bug 36396 – Bug 36396: Prevent link to av for 'specials'

[patch] Bug 36396: Prevent link to av for 'specials'

Bug-36396-Prevent-link-to-av-for-specials.patch (text/plain), 3.49 KB, created by Lukas Koszyk on 2024-03-25 10:10:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Koszyk

Created: 2024-03-25 10:10:49 UTC

Size: 3.49 KB

patch

obsolete

>From 723918f9f80f488eccf9bb830e11a1e5940fd325 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 22 Mar 2024 09:29:45 +0100
>Subject: [PATCH] Bug 36396: Prevent link to av for 'specials'
>
>See previous commit message, 'QA' part.
>We do not support the "specials" categories.
>
>Sponsored-by: The Research University in the Helmholtz Association (KIT)
>Signed-off-by: Lukas Koszyk <lukasz.koszyk@kit.edu>
>---
> admin/searchengine/elasticsearch/mappings.pl                  | 4 ++--
> .../en/modules/admin/searchengine/elasticsearch/mappings.tt   | 3 +++
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl
>index c7f2e6ff02..2569d74e51 100755
>--- a/admin/searchengine/elasticsearch/mappings.pl
>+++ b/admin/searchengine/elasticsearch/mappings.pl
>@@ -28,7 +28,7 @@ use Koha::SearchEngine::Elasticsearch::QueryBuilder;
> use Koha::SearchMarcMaps;
> use Koha::SearchFields;
> use Koha::Caches;
>-use Koha::AuthorisedValueCategories;
>+use Koha::AuthorisedValues;
> 
> use Try::Tiny qw( catch try );
> use Module::Load::Conditional qw( can_load );
>@@ -297,7 +297,7 @@ while ( my $search_field = $search_fields->next ) {
>     push @all_search_fields, $search_field_unblessed;
> }
> 
>-my @authorised_value_categories = Koha::AuthorisedValueCategories->search->get_column('category_name');
>+my @authorised_value_categories = Koha::AuthorisedValues->new->categories;
> push @messages, @errors;
> $template->param(
>     indexes           => \@indexes,
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>index 12cfbb9f73..5fa4537382 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>@@ -522,7 +522,9 @@ a.add, a.delete {
>                                                     <input type="hidden" name="facet_name" value="[% f.name | html %]" />
>                                                 </td>
>                                                 <td>
>+                                                    [% IF f.name != 'itype' && f.name != 'location' && f.name != 'holdingbranch' && f.name != 'homebranch' && f.name != 'ln' && f.name != 'ccode' %]
>                                                     <select name="facet_av_cat_[% f.name | html %]">
>+                                                        <option value=""></option>
>                                                         [% FOR av_cat IN authorised_value_categories %]
>                                                             [% IF f.authorised_value_category == av_cat %]
>                                                                 <option value="[% av_cat | html %]" selected="selected">[% av_cat | html %]</option>
>@@ -531,6 +533,7 @@ a.add, a.delete {
>                                                             [% END %]
>                                                         [% END %]
>                                                     </select>
>+                                                    [% END %]
>                                                 </td>
>                                                 <td>
>                                                     <a class="btn btn-default btn-xs delete-facet" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 36396: 163685 | 163686 | 163687 | 163688 | 163689 | 163690 | 163705 | 163776 | 163777 | 163778 | 163779 | 163780 | 163781 | 163782 | 166246 | 166247 | 166248 | 166249 | 166250 | 166251 | 166252 | 166254 | 166258