Attachment 173484 Details for Bug 33484 – Bug 33484: Pass external filters only if exists

[patch] Bug 33484: Pass external filters only if exists

Bug-33484-Pass-external-filters-only-if-exists.patch (text/plain), 2.47 KB, created by Jonathan Druart on 2024-10-28 09:46:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-10-28 09:46:49 UTC

Size: 2.47 KB

patch

obsolete

>From 0265c0b17ec5b57f7088a2e9aae67b87fff9a8f7 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 24 Oct 2024 10:26:52 +0200
>Subject: [PATCH] Bug 33484: Pass external filters only if exists
>
>The external_filter_nodes object should only be passed if the filters
>block on the left actually exists. So only for the main patron search,
>not the other ones.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../prog/en/includes/patron-search.inc        | 20 +++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>index 708a82b45e1..f3a9af0f9cb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>@@ -31,6 +31,7 @@
> [%# - search_type: select 'contains' or 'starts with' %]
> [%- searchtype = searchtype || Koha.Preference('DefaultPatronSearchMethod') -%]
> [% BLOCK patron_search_filters %]
>+    [% SET has_patron_search_filters_block = 1 %]
>     <aside>
>         <form method="get" class="patron_search_form">
>             <fieldset class="brief">
>@@ -406,14 +407,17 @@
>                     return filters;
>                 }
>             };
>-            let external_filter_nodes = {
>-                search_patron_filter: '.search_patron_filter',
>-                firstletter_filter: '.firstletter_filter',
>-                searchtype_filter: '.searchtype_filter',
>-                searchfieldstype_filter: '.searchfieldstype_filter',
>-                categorycode_filter: '.categorycode_filter',
>-                branchcode_filter: '.branchcode_filter'
>-            };
>+            let external_filter_nodes = {};
>+            [% IF has_patron_search_filters_block %]
>+                external_filter_nodes = {
>+                    search_patron_filter: '.search_patron_filter',
>+                    firstletter_filter: '.firstletter_filter',
>+                    searchtype_filter: '.searchtype_filter',
>+                    searchfieldstype_filter: '.searchfieldstype_filter',
>+                    categorycode_filter: '.categorycode_filter',
>+                    branchcode_filter: '.branchcode_filter'
>+                };
>+            [% END %]
> 
>             [% UNLESS default_sort_column %]
>                 [% default_sort_column = "name" %]
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 33484: 149444 | 149445 | 149447 | 149448 | 149449 | 149925 | 149926 | 149927 | 149928 | 149929 | 149930 | 149974 | 149975 | 149976 | 149977 | 149978 | 149979 | 173443 | 173444 | 173445 | 173446 | 173447 | 173448 | 173449 | 173450 | 173451 | 173452 | 173453 | 173454 | 173455 | 173456 | 173457 | 173458 | 173459 | 173460 | 173461 | 173462 | 173463 | 173464 | 173465 | 173466 | 173467 | 173468 | 173469 | 173470 | 173471 | 173472 | 173473 | 173474 | 173475 | 173476 | 173477 | 173478 | 173479 | 173480 | 173481 | 173482 | 173483 | 173484 | 173485 | 173486 | 173546 | 173606 | 173607 | 173985 | 174219