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 1230-1244 function _dt_save_restore_state(table_settings, external_filter_nodes = {}) { Link Here
1230
     * @return {Object}                               The dataTables instance
1230
     * @return {Object}                               The dataTables instance
1231
     */
1231
     */
1232
    $.fn.kohaTable = function (
1232
    $.fn.kohaTable = function (
1233
        options,
1233
        options = {},
1234
        table_settings,
1234
        table_settings,
1235
        add_filters,
1235
        add_filters,
1236
        default_filters,
1236
        default_filters,
1237
        filters_options,
1237
        filters_options,
1238
        external_filter_nodes
1238
        external_filter_nodes
1239
    ) {
1239
    ) {
1240
        var settings = null;
1241
1242
        // Early return if the node does not exist
1240
        // Early return if the node does not exist
1243
        if (!this.length) return;
1241
        if (!this.length) return;
1244
1242
Lines 1262-1284 function _dt_save_restore_state(table_settings, external_filter_nodes = {}) { Link Here
1262
                options.processing = true;
1260
                options.processing = true;
1263
                options.pagingType = "full_numbers";
1261
                options.pagingType = "full_numbers";
1264
            }
1262
            }
1263
        }
1265
1264
1266
            settings = $.extend(
1265
        var settings = $.extend(
1267
                true,
1266
            true,
1268
                {},
1267
            {},
1269
                dataTablesDefaults,
1268
            dataTablesDefaults,
1270
                {
1269
            {
1271
                    paging: true,
1270
                paging: true,
1272
                    searching: true,
1271
                searching: true,
1273
                    language: {
1272
                language: {
1274
                        emptyTable: options.emptyTable
1273
                    emptyTable: options.emptyTable
1275
                            ? options.emptyTable
1274
                        ? options.emptyTable
1276
                            : __("No data available in table"),
1275
                        : __("No data available in table"),
1277
                    },
1278
                },
1276
                },
1279
                options
1277
            },
1280
            );
1278
            options
1281
        }
1279
        );
1282
1280
1283
        settings["buttons"] = _dt_buttons({ settings, table_settings });
1281
        settings["buttons"] = _dt_buttons({ settings, table_settings });
1284
1282
(-)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