Bugzilla – Attachment 116434 Details for
Bug 26602
Datatables - Actions columns should not be exported
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26602: (QA follow-up) Cleanup datatables settings
Bug-26602-QA-follow-up-Cleanup-datatables-settings.patch (text/plain), 3.85 KB, created by
Nick Clemens
on 2021-02-05 19:18:06 UTC
(
hide
)
Description:
Bug 26602: (QA follow-up) Cleanup datatables settings
Filename:
MIME Type:
Creator:
Nick Clemens
Created:
2021-02-05 19:18:06 UTC
Size:
3.85 KB
patch
obsolete
>From fca6deb05d79a6e5c607dc041644f4ac55e27916 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 5 Feb 2021 17:45:34 +0000 >Subject: [PATCH] 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> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt | 11 ++++------- > koha-tmpl/intranet-tmpl/prog/js/letter.js | 5 ----- > 3 files changed, 6 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >index aa73af614b..9bc75fc4ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -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> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >index 3501c44763..8f428016de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt >@@ -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 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/letter.js b/koha-tmpl/intranet-tmpl/prog/js/letter.js >index c2e353bfe8..84e63c9d96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/letter.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/letter.js >@@ -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 ){ >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26602
:
115237
|
115249
|
116433
| 116434 |
117203
|
117212
|
117216