Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Nick Clemens 2021-02-05 17:45:34 +00:00 committed by Jonathan Druart
parent 655f11fd60
commit 6118d24904
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
View file

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

11
koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
View file

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

5
koha-tmpl/intranet-tmpl/prog/js/letter.js
View file

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