Attachment 126672 Details for Bug 29186 – Bug 29186: (QA follow-up) Correct the check for showing limit menu

[patch] Bug 29186: (QA follow-up) Correct the check for showing limit menu

Bug-29186-QA-follow-up-Correct-the-check-for-showi.patch (text/plain), 4.51 KB, created by Owen Leonard on 2021-10-21 16:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2021-10-21 16:50:09 UTC

Size: 4.51 KB

patch

obsolete

>From fd7ffd8af09e6ee7802b36e8b00695ae03c94c52 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 11 Oct 2021 10:57:40 +0000
>Subject: [PATCH] Bug 29186: (QA follow-up) Correct the check for showing limit
> menu
>
>The template conditional for showing the limit menu should be changed
>to:
>
>[% IF ( unlimited_total > 10 && limit <= 1000 ) %]
>
>- "unlimited_total > 10" so that the "rows per page" button only shows
>  if there are more than 10 total results, because 10 is the smallest
>  increment the "rows per page" control offers.
>- "limit <= 1000" so that the "rows per page" button will show when the
>  current result limit is less than or equal to 1000, because 1000 is
>  the upper limit to the "rows per page" control.
>---
> .../prog/en/modules/reports/guided_reports_start.tt  | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>index bc07ed8ecc..47ed17190c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>@@ -902,7 +902,7 @@
>                         <p>
>                             <span class="label">Total number of results:</span>
>                             [% unlimited_total | html %]
>-                            [% IF unlimited_total > limit %]
>+                            [% IF unlimited_total >= limit %]
>                                 ([% limit | html %] shown)
>                             [% END %].
>                         </p>
>@@ -1015,12 +1015,12 @@
>                                 <input type="hidden" name="limit" id="limit" value="20" />
>                             </form> 
> 
>-                            [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) || ( unlimited_total ) > limit %]
>+                            [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) || ( unlimited_total > 10 && limit <= 1000 ) %]
>                                 <div id="toolbar" class="btn-toolbar">
>                                     [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %]
>                                         <div class="btn-group">
>                                             <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="batch_mod_menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
>-                                                Batch operations with [% IF unlimited_total > limit %][% limit | html %][% ELSE %][% unlimited_total | html %][% END %] visible records
>+                                                Batch operations with [% IF unlimited_total >= limit %][% limit | html %][% ELSE %][% unlimited_total | html %][% END %] visible records
>                                                 <span class="caret"></span>
>                                             </button>
>                                             <ul class="dropdown-menu" aria-labelledby="batch_mod_menu">
>@@ -1063,7 +1063,7 @@
>                                         </div> 
>                                     [% END # /IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %]
> 
>-                                    [% IF ( unlimited_total > limit ) %]
>+                                    [% IF ( unlimited_total > 10 && limit <= 1000 ) %]
>                                         <div class="btn-group">
>                                             <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
>                                                 [% IF ( limit ) %]
>@@ -1088,9 +1088,9 @@
>                                                 [% END %]
>                                             </ul>
>                                         </div>
>-                                    [% END # /IF ( unlimited_total > limit ) %]
>+                                    [% END # /IF ( unlimited_total > 10 && limit <= 1000 ) %]
>                                 </div> 
>-                            [% END # /IF batch operations || ( unlimited_total > limit ) %]
>+                            [% END # /IF batch operations || ( unlimited_total > 10 && limit <= 1000 ) %]
> 
>                             <div class="pages">
>                                 [% pagination_bar | $raw %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 29186: 125831 | 125832 | 125888 | 126044 | 126672 | 126800 | 126801