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

(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-18 / +16 lines)
Lines 1300-1306 function update_search_description( Link Here
1300
     * @return {Object}                               The dataTables instance
1300
     * @return {Object}                               The dataTables instance
1301
     */
1301
     */
1302
    $.fn.kohaTable = function (
1302
    $.fn.kohaTable = function (
1303
        options,
1303
        options = {},
1304
        table_settings,
1304
        table_settings,
1305
        add_filters,
1305
        add_filters,
1306
        default_filters,
1306
        default_filters,
Lines 1309-1316 function update_search_description( Link Here
1309
        show_search_descriptions,
1309
        show_search_descriptions,
1310
        additional_search_descriptions
1310
        additional_search_descriptions
1311
    ) {
1311
    ) {
1312
        var settings = null;
1313
1314
        // Early return if the node does not exist
1312
        // Early return if the node does not exist
1315
        if (!this.length) return;
1313
        if (!this.length) return;
1316
1314
Lines 1334-1356 function update_search_description( Link Here
1334
                options.processing = true;
1332
                options.processing = true;
1335
                options.pagingType = "full_numbers";
1333
                options.pagingType = "full_numbers";
1336
            }
1334
            }
1335
        }
1337
1336
1338
            settings = $.extend(
1337
        var settings = $.extend(
1339
                true,
1338
            true,
1340
                {},
1339
            {},
1341
                dataTablesDefaults,
1340
            dataTablesDefaults,
1342
                {
1341
            {
1343
                    paging: true,
1342
                paging: true,
1344
                    searching: true,
1343
                searching: true,
1345
                    language: {
1344
                language: {
1346
                        emptyTable: options.emptyTable
1345
                    emptyTable: options.emptyTable
1347
                            ? options.emptyTable
1346
                        ? options.emptyTable
1348
                            : __("No data available in table"),
1347
                        : __("No data available in table"),
1349
                    },
1350
                },
1348
                },
1351
                options
1349
            },
1352
            );
1350
            options
1353
        }
1351
        );
1354
1352
1355
        settings["buttons"] = _dt_buttons({ settings, table_settings });
1353
        settings["buttons"] = _dt_buttons({ settings, table_settings });
1356
1354
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js (-19 / +16 lines)
Lines 295-303 function _dt_visibility(table_settings, table_dt) { Link Here
295
     *                                                available from the columns_settings template toolkit include
295
     *                                                available from the columns_settings template toolkit include
296
     * @return {Object}                               The dataTables instance
296
     * @return {Object}                               The dataTables instance
297
     */
297
     */
298
    $.fn.kohaTable = function (options, table_settings) {
298
    $.fn.kohaTable = function (options = {}, table_settings = undefined) {
299
        var settings = null;
300
301
        // Early return if the node does not exist
299
        // Early return if the node does not exist
302
        if (!this.length) return;
300
        if (!this.length) return;
303
301
Lines 310-332 function _dt_visibility(table_settings, table_dt) { Link Here
310
                    dataTablesDefaults.initComplete(settings, json);
308
                    dataTablesDefaults.initComplete(settings, json);
311
                };
309
                };
312
            }
310
            }
311
        }
313
312
314
            settings = $.extend(
313
        var settings = $.extend(
315
                true,
314
            true,
316
                {},
315
            {},
317
                dataTablesDefaults,
316
            dataTablesDefaults,
318
                {
317
            {
319
                    paging: true,
318
                paging: true,
320
                    searching: true,
319
                searching: true,
321
                    language: {
320
                language: {
322
                        emptyTable: options.emptyTable
321
                    emptyTable: options.emptyTable
323
                            ? options.emptyTable
322
                        ? options.emptyTable
324
                            : __("No data available in table"),
323
                        : __("No data available in table"),
325
                    },
326
                },
324
                },
327
                options
325
            },
328
            );
326
            options
329
        }
327
        );
330
328
331
        settings["buttons"] = _dt_buttons({ settings, table_settings });
329
        settings["buttons"] = _dt_buttons({ settings, table_settings });
332
330
333
- 

Return to bug 38255