Attachment 174488 Details for Bug 30745 – Bug 30745: Display pagination for the results page

[patch] Bug 30745: Display pagination for the results page

Bug-30745-Display-pagination-for-the-results-page.patch (text/plain), 6.80 KB, created by David Cook on 2024-11-14 05:58:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Cook

Created: 2024-11-14 05:58:23 UTC

Size: 6.80 KB

patch

obsolete

>From 030e8e313dd906b4d77b71030ce09318f70ed282 Mon Sep 17 00:00:00 2001
>From: Emily-Rose Francoeur <emily-rose.francoeur@inLibro.com>
>Date: Thu, 26 Oct 2023 11:28:35 -0400
>Subject: [PATCH] Bug 30745: Display pagination for the results page
>
>I have fixed the pagination issue when the search returns multiple results.
>
>Test plan:
>    - Enable elasticsearch
>    - git to labels/label-item-search.pl
>    - search using after date only
>            => check you get items with date-of-acquisition greater than after
>date
>    - search using before date only
>            => check you get items with date-of-acquisition less than before
>date
>    - search using after and before date
>            => check you get items with date-of-acquisition between after and
>before
>    - Combine this searches with a specified index
>    - enable zebra and repeat these tests
>pagination tests
>    - Perform a search that returns more than 20 notices
>    - Navigate through different result pages using page numbers, the "Next" button, and the "Previous" button
>	    => On each page, check that "Results X through X of X" displays the correct information
>
>Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com>
>Signed-off-by: David Cook <dcook@prosentient.com.au>
>---
> .../prog/en/modules/labels/result.tt          |  7 ++---
> labels/label-item-search.pl                   | 29 +++++++++----------
> 2 files changed, 17 insertions(+), 19 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>index 97fa3ac37e..7842ef2172 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt
>@@ -6,7 +6,7 @@
>             <ul class="pagination">
>                 [% IF ( displayprev ) %]
>                     <li class="page-item">
>-                        <a class="page-link" href="label-item-search.pl?startfrom=[% startfromprev | html %]&amp;ccl_query=[% ccl_query | html %]&amp;resultsperpage=[% resultsperpage | html %]&amp;op=do_search&amp;batch_id=[% batch_id | html %]"><i class="fa fa-arrow-left"></i> Previous</a>
>+                        <a class="page-link" href="label-item-search.pl?startfrom=[% startfromprev | html %]&amp;idx=[% idx | html %]&amp;resultsperpage=[% resultsperpage | html %]&amp;op=do_search&amp;batch_id=[% batch_id | html %]&amp;ccl_textbox=[% ccl_textbox | html %]&amp;limits=[% limits | html %]"><i class="fa fa-arrow-left"></i> Previous</a>
>                     </li>
>                 [% END %]
>                 [% FOREACH number IN numbers %]
>@@ -16,13 +16,13 @@
>                         </li>
>                     [% ELSE %]
>                         <li class="page-item">
>-                            <a class="page-link" href="label-item-search.pl?startfrom=[% number.startfrom | html %]&amp;ccl_query=[% ccl_query | html %]&amp;resultsperpage=[% resultsperpage | html %]&amp;op=do_search&amp;batch_id=[% batch_id | html %]">[% number.number | html %]</a>
>+                            <a class="page-link" href="label-item-search.pl?startfrom=[% number.startfrom | html %]&amp;idx=[% idx | html %]&amp;resultsperpage=[% resultsperpage | html %]&amp;op=do_search&amp;batch_id=[% batch_id | html %]&amp;ccl_textbox=[% ccl_textbox | html %]&amp;limits=[% limits | html %]">[% number.number | html %]</a>
>                         </li>
>                     [% END %]
>                 [% END %]
>                 [% IF ( displaynext ) %]
>                     <li class="page-item">
>-                        <a class="page-link" href="label-item-search.pl?startfrom=[% startfromnext | html %]&amp;ccl_query=[% ccl_query | html %]&amp;resultsperpage=[% resultsperpage | html %]&amp;op=do_search&amp;batch_id=[% batch_id | html %]">Next <i class="fa fa-arrow-right"></i></a>
>+                        <a class="page-link" href="label-item-search.pl?startfrom=[% startfromnext | html %]&amp;idx=[% idx | html %]&amp;resultsperpage=[% resultsperpage | html %]&amp;op=do_search&amp;batch_id=[% batch_id | html %]&amp;ccl_textbox=[% ccl_textbox | html %]&amp;limits=[% limits | html %]">Next <i class="fa fa-arrow-right"></i></a>
>                     </li>
>                 [% END %]
>             </ul>
>@@ -60,7 +60,6 @@
>             </div>
> 
>                 <div id="label-search-results" class="page-section">
>-                <input type="hidden" name="ccl_query" value="[% ccl_query | html %]" />
>             [% FOREACH result_se IN result_set %]
>             <div style="border-bottom:1px solid #CCC;padding:1em 0;">
>                     <h4>[% result_se.title | html %]</h4>
>diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
>index b07e4e1c93..8cebec8278 100755
>--- a/labels/label-item-search.pl
>+++ b/labels/label-item-search.pl
>@@ -40,7 +40,7 @@ my $query = CGI->new;
> my $type      = $query->param('type');
> my $op        = $query->param('op') || '';
> my $batch_id  = $query->param('batch_id');
>-my $ccl_query = $query->param('ccl_query');
>+my @limits    = split(" AND ", $query->param('limits') || "");
> my $startfrom = $query->param('startfrom') || 1;
> my ($template, $loggedinuser, $cookie) = (undef, undef, undef);
> my (
>@@ -68,13 +68,9 @@ if ( $op eq "do_search" ) {
>     my $searcher = Koha::SearchEngine::Search->new(
>         { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
> 
>-    my @limits;
>-    if ($datefrom) {
>-        push(@limits, "acqdate,ge,st-date-normalized=$datefrom");
>-    }
>-
>-    if ($dateto) {
>-        push(@limits, "acqdate,le,st-date-normalized=$dateto");
>+    if (!@limits) {
>+        push(@limits, "acqdate,ge,st-date-normalized=$datefrom") if ($datefrom);
>+        push(@limits, "acqdate,le,st-date-normalized=$dateto") if ($dateto);
>     }
> 
>     my ( $build_error, $query, $simple_query, $query_cgi,
>@@ -90,8 +86,9 @@ if ( $op eq "do_search" ) {
>     );
> 
>     if (!defined $error && @{$results->{biblioserver}{RECORDS}} ) {
>-        $show_results = @{$results->{biblioserver}{RECORDS}};
>-        $marcresults = $results->{biblioserver}{RECORDS};
>+        $show_results = grep { defined $_ } @{$results->{biblioserver}{RECORDS}};
>+        $marcresults = [ grep { defined $_ } @{$results->{biblioserver}{RECORDS}} ];
>+        $total_hits = $results->{biblioserver}{hits};
>     }
>     else {
>         Koha::Logger->get->warn("ERROR label-item-search: no results from simple_search_compat");
>@@ -196,11 +193,13 @@ if ($show_results) {
>     );
> 
>     $template->param(
>-        results   => ($show_results ? 1 : 0),
>-        result_set=> \@results_set,
>-        batch_id  => $batch_id,
>-        type      => $type,
>-        ccl_query => $ccl_query,
>+        results     => ($show_results ? 1 : 0),
>+        result_set  => \@results_set,
>+        batch_id    => $batch_id,
>+        type        => $type,
>+        idx         => $idx,
>+        ccl_textbox => $ccl_textbox,
>+        limits      => join(" AND ", @limits),
>     );
> }
> 
>-- 
>2.39.5

Actions: View | Diff | Splinter Review

Attachments on bug 30745: 134952 | 134953 | 135784 | 135785 | 135966 | 135967 | 157192 | 157194 | 157195 | 157934 | 162855 | 163955 | 170677 | 170678 | 170679 | 170680 | 170681 | 170682 | 170683 | 170684 | 170729 | 170730 | 170731 | 170732 | 170733 | 171002 | 171003 | 171004 | 171005 | 171006 | 173280 | 173943 | 173944 | 173945 | 173946 | 173947 | 174486 | 174487 | 174488 | 174489 | 174490 | 174491