From 87620d330b943fa92a7737a683a5b5ffced51912 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Tue, 12 Mar 2024 17:46:59 +0000 Subject: [PATCH] Bug 36302: Remove defer_loading logic Test plan, ktd: 1) Search "henry" on the top search bar, notice 1 result is auto suggested 2) Ignore the auto-complete, press 'Enter' instead 3) Notice no results are returned. 4) Apply patch. Repeat. --- .../intranet-tmpl/prog/en/includes/patron-search.inc | 10 +--------- members/member.pl | 3 --- 2 files changed, 1 insertion(+), 12 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 c481838b213..9cabd070387 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -285,11 +285,6 @@ let Sticky; let singleBranchMode = '[% singleBranchMode | html %]'; let logged_in_library_id = "[% Branches.GetLoggedInBranchcode | html %]"; - [% IF do_not_defer_loading %] - let defer_loading = 0; - [% ELSE %] - let defer_loading = 1; - [% END %] [% IF adjust_history %] /* popstate event triggered by forward and back button. Need to refresh search */ @@ -431,7 +426,6 @@ [% END %] }, [% END %] - "deferLoading": defer_loading, "columns": [ [% FOR column IN columns %] [% IF default_sort_column == column %] @@ -721,9 +715,7 @@ patron_search_form.find(".searchpattern").parent().hide(); }); - if ( !defer_loading ) { - patron_search_form.submit(); - } + patron_search_form.submit(); [% IF adjust_history %] /* Initial page load does not trigger the popstate event, so we explicitly call this */ diff --git a/members/member.pl b/members/member.pl index 6f63ec51668..1f5bd5693ab 100755 --- a/members/member.pl +++ b/members/member.pl @@ -69,8 +69,6 @@ my $searchtype = $input->param('searchtype'); $template->param( 'alphabet' => C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' ); -my $defer_loading = $input->request_method() eq "GET" && !$circsearch ? 1 : 0; - $template->param( patron_lists => [ GetPatronLists() ], searchmember => $searchmember, @@ -79,7 +77,6 @@ $template->param( searchtype => $searchtype, searchfieldstype => $searchfieldstype, PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20, - do_not_defer_loading => !$defer_loading, circsearch => $circsearch, ); -- 2.30.2