From 033ce601a3fcbac339adcee1d60461fc4d87df4b Mon Sep 17 00:00:00 2001 From: Owen Leonard 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. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../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 @@

Total number of results: [% unlimited_total | html %] - [% IF unlimited_total > limit %] + [% IF unlimited_total >= limit %] ([% limit | html %] shown) [% END %].

@@ -1015,12 +1015,12 @@ - [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) || ( unlimited_total ) > limit %] + [% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) || ( unlimited_total > 10 && limit <= 1000 ) %]
[% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %]
[% END # /IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers ) %] - [% IF ( unlimited_total > limit ) %] + [% IF ( unlimited_total > 10 && limit <= 1000 ) %]
- [% END # /IF ( unlimited_total > limit ) %] + [% END # /IF ( unlimited_total > 10 && limit <= 1000 ) %]
- [% END # /IF batch operations || ( unlimited_total > limit ) %] + [% END # /IF batch operations || ( unlimited_total > 10 && limit <= 1000 ) %]
[% pagination_bar | $raw %] -- 2.39.5