diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js index e4847cb377..631c9833bd 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js @@ -40,29 +40,6 @@ var dataTablesDefaults = { dom: "t", buttons: ["clearFilter", "copy", "csv", "print"], paging: false, - buttons: [ - { - fade: 100, - className: "dt_button_clear_filter", - titleAttr: __("Clear filter"), - enabled: false, - text: - ' ' + - __("Clear filter") + - "", - available: function (dt) { - // The "clear filter" button is made available if this test returns true - if (dt.settings()[0].aanFeatures.f) { - // aanFeatures.f is null if there is no search form - return true; - } - }, - action: function (e, dt, node) { - dt.search("").draw("page"); - node.addClass("disabled"); - }, - }, - ], initComplete: function (settings) { var tableId = settings.nTable.id; state = settings.oLoadedState; @@ -183,21 +160,46 @@ function _dt_buttons(params) { }, ]; - let buttons = []; - buttons.push({ - fade: 100, - className: "dt_button_clear_filter", - titleAttr: __("Clear filter"), - enabled: false, - text: - ' ' + - __("Clear filter") + - "", - action: function (e, dt, node, config) { - dt.search("").draw("page"); - node.addClass("disabled"); + let buttons = [ + { + fade: 100, + className: "dt_button_clear_filter", + titleAttr: _("Clear filter"), + enabled: false, + text: + ' ' + + _("Clear filter") + + "", + action: function (e, dt, node, config) { + dt.search("").draw("page"); + node.addClass("disabled"); + }, }, - }); + { + extend: "csvHtml5", + text: _("CSV"), + exportOptions: { + columns: exportColumns, + format: export_format, + }, + }, + { + extend: "copyHtml5", + text: _("Copy"), + exportOptions: { + columns: exportColumns, + format: export_format, + }, + }, + { + extend: "print", + text: _("Print"), + exportOptions: { + columns: exportColumns, + format: export_format, + }, + }, + ]; // Retrieving bKohaColumnsUseNames from the options passed to the constructor, not DT's settings // But ideally should be retrieved using table.data() @@ -234,19 +236,6 @@ function _dt_buttons(params) { }); } - buttons.push({ - extend: "collection", - autoClose: true, - fade: 100, - className: "export_controls", - titleAttr: __("Export or print"), - text: - ' ' + - __("Export") + - "", - buttons: export_buttons, - }); - return buttons; }