Bug 26602: (QA follow-up) Cleanup datatables settings

On letter.tt we had nosort and set things via settings that are default in KohaTable so removed
those from letter.js. Also made the last updated column exportable

On upload.tt the noExport didn't do anything, because we couldn't export, so moved to used KohaTable

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 6118d24904)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Nick Clemens 2021-02-05 17:45:34 +00:00 committed by Fridolin Somers
parent 75f9b4ebb1
commit 345fd26eaa
3 changed files with 6 additions and 14 deletions

View File

@ -145,8 +145,8 @@
<th>Code</th>
<th>Name</th>
<th class="title-string">Last updated</th>
<th class="nosort">Copy notice</th>
<th class="nosort noExport">Actions</th>
<th class="NoSort noExport">Copy notice</th>
<th class="NoSort noExport">Actions</th>
</tr>
</thead>
<tbody>

View File

@ -1,6 +1,7 @@
[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE TablesSettings %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF plugin %]
@ -159,7 +160,7 @@
<th>Category</th>
[% IF !plugin %]<th>Public</th>[% END %]
[% IF !plugin %]<th>Temporary</th>[% END %]
<th class="nosort noExport">Actions</th>
<th class="NoSort noExport">Actions</th>
</tr>
</thead>
<tbody>
@ -256,6 +257,7 @@
[% Asset.js("js/tools-menu.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
[% Asset.js("js/file-upload.js") | $raw %]
[% INCLUDE 'columns_settings.inc' %]
<script>
function StartUpload() {
if( $('#fileToUpload').prop('files').length == 0 ) return;
@ -382,12 +384,7 @@
window.close();
}
$(document).ready(function() {
$("#uploadresults").dataTable($.extend(true, {}, dataTablesDefaults, {
"aoColumnDefs": [
{ 'bSortable': false, 'aTargets': [ 'nosort' ] }
],
"sPaginationType": "full"
}));
KohaTable("uploadresults",{});
[% IF msg %]
ShowAlerts( [% msg | html %] );
[% END %]

View File

@ -45,11 +45,6 @@ $(document).ready(function() {
"autoWidth": false,
"paging": false,
"aaSorting": [[ 3, "asc" ]],
"columnDefs": [
{ "bSortable": false, "aTargets": [ "nosort" ] },
{ "sType": "title-string", "aTargets" : [ "title-string"] }
],
"exportColumns": [0,1,2,3],
}, columns_settings);
if( no_op_set ){