View | Details | Raw Unified | Return to bug 38259
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc (-24 / +7 lines)
Lines 350-377 Link Here
350
                parent_block.find(".info").hide();
350
                parent_block.find(".info").hide();
351
                parent_block.find(".error").hide();
351
                parent_block.find(".error").hide();
352
352
353
                // Build the aLengthMenu
353
                // Build the lengthMenu
354
                let aLengthMenu = [
354
                let lengthMenu = dataTablesDefaults.lengthMenu;
355
                    ...new Set([[% Koha.Preference('PatronsPerPage') | html %], 10, 20, 50, 100, -1])
355
                let patronsPerPage = [% Koha.Preference('PatronsPerPage') || '20' | html %]
356
                ];
356
                // Merge, remove -1, sort, add -1
357
                aLengthMenu.sort(function( a, b ){
357
                lengthMenu = [...new Set(lengthMenu.concat(patronsPerPage).filter(v => v !== -1))].sort((a, b) => a - b).concat(-1);
358
                    // Put "All" at the end
359
                    if ( a == -1 ) {
360
                        return 1;
361
                    } else if ( b == -1 ) {
362
                        return -1;
363
                    }
364
                    return parseInt(a) < parseInt(b) ? -1 : 1;}
365
                );
366
                let aLengthMenuLabel = [];
367
                $(aLengthMenu).each(function(){
368
                    if ( this == -1 ) {
369
                        // Label for -1 is "All"
370
                        aLengthMenuLabel.push(_("All"));
371
                    } else {
372
                        aLengthMenuLabel.push(this);
373
                    }
374
                });
375
358
376
                let additional_filters = {
359
                let additional_filters = {
377
                    surname: function(){
360
                    surname: function(){
Lines 774-782 Link Here
774
                    'embed': [% To.json(embed) | $raw %],
757
                    'embed': [% To.json(embed) | $raw %],
775
                    "order": [[ [% order_column_index | html %], "asc" ]],
758
                    "order": [[ [% order_column_index | html %], "asc" ]],
776
                    "autoWidth": false,
759
                    "autoWidth": false,
777
                    'lengthMenu': [aLengthMenu, aLengthMenuLabel],
760
                    lengthMenu,
761
                    pageLength: patronsPerPage,
778
                    "pagingType": 'full_numbers',
762
                    "pagingType": 'full_numbers',
779
                    "pageLength": [% Koha.Preference('PatronsPerPage') | html %],
780
                    [% IF sticky_header %]
763
                    [% IF sticky_header %]
781
                        "initComplete": function(settings, json) {
764
                        "initComplete": function(settings, json) {
782
                            $("#[% sticky_header | html %]").show();
765
                            $("#[% sticky_header | html %]").show();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-4 / +1 lines)
Lines 372-381 Link Here
372
                var receivedt = $("#receivedt").kohaTable({
372
                var receivedt = $("#receivedt").kohaTable({
373
                    stateSave: true, // We do not have table settings on this table
373
                    stateSave: true, // We do not have table settings on this table
374
                    pageLength: 10,
374
                    pageLength: 10,
375
                    lengthMenu: [
375
                    lengthMenu: [5, 10, 20, 50, 100, -1],
376
                        [5, 10, 20, 50, 100, -1],
377
                        [5, 10, 20, 50, 100, _("All")],
378
                    ],
379
                    columns: [
376
                    columns: [
380
                        { type: "html" },
377
                        { type: "html" },
381
                        { type: "html" },
378
                        { type: "html" },
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt (-5 lines)
Lines 323-333 Link Here
323
                autoWidth: false,
323
                autoWidth: false,
324
                dom: 't<"bottom pager"ilpf>',
324
                dom: 't<"bottom pager"ilpf>',
325
                pagingType: "full",
325
                pagingType: "full",
326
                lengthMenu: [
327
                    [10, 20, 50, 100, -1],
328
                    [10, 20, 50, 100, "All"],
329
                ],
330
                pageLength: 20,
331
                order: [[0, "asc"]],
326
                order: [[0, "asc"]],
332
            });
327
            });
333
328
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt (-15 / +6 lines)
Lines 289-308 Link Here
289
        };
289
        };
290
290
291
        $(document).ready(function() {
291
        $(document).ready(function() {
292
            // Prepare DataTables settings
292
            // Build the lengthMenu
293
            var aLengthMenu = [10, 20, 50, 100, -1];
293
            let lengthMenu = dataTablesDefaults.lengthMenu;
294
            var aLengthMenuLabel = [10, 20, 50, 100, _("All")];
294
            let patronsPerPage = [% Koha.Preference('PatronsPerPage') || '20' | html %]
295
            var patronsPerPage = [% Koha.Preference('PatronsPerPage') | html %];
295
            // Merge, remove -1, sort, add -1
296
            for ( var i = 0; i < aLengthMenu.length; i++ ) {
296
            lengthMenu = [...new Set(lengthMenu.concat(patronsPerPage).filter(v => v !== -1))].sort((a, b) => a - b).concat(-1);
297
                if ( aLengthMenu[i] == patronsPerPage ) {
298
                    break;
299
                }
300
                if ( aLengthMenu[i] > patronsPerPage || aLengthMenu[i] == -1 ) {
301
                    aLengthMenu.splice(i, 0, patronsPerPage);
302
                    aLengthMenuLabel.splice(i, 0, patronsPerPage);
303
                    break;
304
                }
305
            }
306
297
307
            [% IF table_loop %]
298
            [% IF table_loop %]
308
                $("#description").show();
299
                $("#description").show();
Lines 312-318 Link Here
312
            $("#batcht").kohaTable({
303
            $("#batcht").kohaTable({
313
                order: [[0, "asc"]],
304
                order: [[0, "asc"]],
314
                pagingType: "full",
305
                pagingType: "full",
315
                lengthMenu: [aLengthMenu, aLengthMenuLabel],
306
                lengthMenu,
316
                pageLength: patronsPerPage,
307
                pageLength: patronsPerPage,
317
                autoWidth: false,
308
                autoWidth: false,
318
            });
309
            });
(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-4 / +4 lines)
Lines 17-22 var dataTablesDefaults = { Link Here
17
        infoEmpty: __("No entries to show"),
17
        infoEmpty: __("No entries to show"),
18
        infoFiltered: __("(filtered from _MAX_ total entries)"),
18
        infoFiltered: __("(filtered from _MAX_ total entries)"),
19
        lengthMenu: __("Show _MENU_ entries"),
19
        lengthMenu: __("Show _MENU_ entries"),
20
        lengthLabels: {
21
            "-1": __("All"),
22
        },
20
        loadingRecords: __("Loading..."),
23
        loadingRecords: __("Loading..."),
21
        processing: __("Processing..."),
24
        processing: __("Processing..."),
22
        search: __("Search:"),
25
        search: __("Search:"),
Lines 60-69 var dataTablesDefaults = { Link Here
60
            },
63
            },
61
        },
64
        },
62
    ],
65
    ],
63
    lengthMenu: [
66
    lengthMenu: [10, 20, 50, 100, -1],
64
        [10, 20, 50, 100, -1],
65
        [10, 20, 50, 100, __("All")],
66
    ],
67
    pageLength: 20,
67
    pageLength: 20,
68
    fixedHeader: true,
68
    fixedHeader: true,
69
    initComplete: function (settings) {
69
    initComplete: function (settings) {
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue (-4 / +1 lines)
Lines 103-112 export default { Link Here
103
                    embed: "title",
103
                    embed: "title",
104
                    ordering: false,
104
                    ordering: false,
105
                    dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>',
105
                    dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>',
106
                    lengthMenu: [
106
                    lengthMenu: [10, 20, 50, 100],
107
                        [10, 20, 50, 100],
108
                        [10, 20, 50, 100],
109
                    ],
110
                },
107
                },
111
                filters_options: {
108
                filters_options: {
112
                    1: () =>
109
                    1: () =>
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue (-4 / +1 lines)
Lines 107-116 export default { Link Here
107
                    embed: "resources+count,vendor.name",
107
                    embed: "resources+count,vendor.name",
108
                    ordering: false,
108
                    ordering: false,
109
                    dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>',
109
                    dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>',
110
                    lengthMenu: [
110
                    lengthMenu: [10, 20, 50, 100],
111
                        [10, 20, 50, 100],
112
                        [10, 20, 50, 100],
113
                    ],
114
                },
111
                },
115
                table_settings: this.eholdings_titles_table_settings,
112
                table_settings: this.eholdings_titles_table_settings,
116
                actions: { 0: ["show"] },
113
                actions: { 0: ["show"] },
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue (-4 / +1 lines)
Lines 94-103 export default { Link Here
94
                embed: ["package.name"],
94
                embed: ["package.name"],
95
                ordering: false,
95
                ordering: false,
96
                dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>',
96
                dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>',
97
                lengthMenu: [
97
                lengthMenu: [10, 20, 50, 100],
98
                    [10, 20, 50, 100],
99
                    [10, 20, 50, 100],
100
                ],
101
                autoWidth: false,
98
                autoWidth: false,
102
                columns: [
99
                columns: [
103
                    {
100
                    {
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue (-5 / +1 lines)
Lines 113-122 export default { Link Here
113
                options: {
113
                options: {
114
                    ordering: false,
114
                    ordering: false,
115
                    dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>',
115
                    dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>',
116
                    lengthMenu: [
116
                    lengthMenu: [10, 20, 50, 100],
117
                        [10, 20, 50, 100],
118
                        [10, 20, 50, 100],
119
                    ],
120
                },
117
                },
121
                filters_options: {
118
                filters_options: {
122
                    1: () =>
119
                    1: () =>
123
- 

Return to bug 38259