From b06152d2aafc261a6ff43f87675362a66564700f Mon Sep 17 00:00:00 2001 From: Michael Hafen Date: Fri, 13 Aug 2021 15:52:52 -0600 Subject: [PATCH] Bug 28864: Have patron search use PatronsPerPage better. Add pageLength to members/member.tt Add aLengthMenu and pageLength to patroncards/add_user_search (common/patron_search.tt). Add aLengthMenu, pageLength, and iDisplayLength to patroncards/edit-batch Test plan: 1. Set the PatronsPerPage system preference to any integer other than 20. 2. Go to the Patrons page and search for patrons. 3. Observe that the per page drop down defaults to 20. 4. Go to Tools -> Patron card creator. 5. Start a new Card Batch. 6. Click the 'Add patron(s)' button to open the patron search window. 7. Do a search. 8. Observe that the per page drop down defaults to 20. 8b. If the PatronsPerPage was set to a value other than 10, 20, 50, or 100 observe that that value is not in the per page drop down. 9. Close patron search window. 10. Apply patch. 11. Click the 'Add patron(s)' button again to open the patron search window. 12. Do a search. 13. Observe that the per page drop down includes the value of PatronsPerPage and that value is selected by default. 14. Go back to the Patrons page and search for patrons. 15. Observe that the per page drop down defaults to the value of the PatronsPerPage system preference. Signed-off-by: Sally Signed-off-by: Sally Signed-off-by: Sally --- .../prog/en/modules/patroncards/edit-batch.tt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index 554342bed3..d4b3edaf9a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -250,6 +250,21 @@ }; $(document).ready(function() { + // Prepare DataTables settings + var aLengthMenu = [10, 20, 50, 100, -1]; + var aLengthMenuLabel = [10, 20, 50, 100, _("All")]; + var patronsPerPage = [% Koha.Preference('PatronsPerPage') | html %]; + for ( var i = 0; i < aLengthMenu.length; i++ ) { + if ( aLengthMenu[i] == patronsPerPage ) { + break; + } + if ( aLengthMenu[i] > patronsPerPage || aLengthMenu[i] == -1 ) { + aLengthMenu.splice(i, 0, patronsPerPage); + aLengthMenuLabel.splice(i, 0, patronsPerPage); + break; + } + } + [% IF table_loop %] $("#description").show(); [% ELSE %] @@ -261,6 +276,8 @@ ], "aaSorting": [[ 0, "asc" ]], "sPaginationType": "full", + "aLengthMenu": [aLengthMenu, aLengthMenuLabel], + "pageLength": patronsPerPage, "autoWidth": false })); $("#additems").click(function(){ -- 2.30.2