From f4ab8129ebbe768ad3955a74c9cee73773b617b7 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 16 Dec 2021 14:09:28 +0100 Subject: [PATCH] Bug 29648: Notice template - only sort --- admin/columns_settings.yml | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/letter.js | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 6496f612dae..83ec66d8d06 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1636,6 +1636,7 @@ modules: cannot_be_modified: 1 notices: lettert: + default_sort_order: 3 columns: - columnname: library 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 f2337e39e92..6636e133aa1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -603,7 +603,7 @@ var code = '[% code | html %]'; var new_lettercode = '[% new_lettercode | html %]'; var new_branchcode = '[% new_branchcode | html %]'; - var columns_settings = [% TablesSettings.GetColumns( 'tools', 'notices', 'lettert', 'json' ) | $raw %]; + var table_settings = [% TablesSettings.GetColumns( 'tools', 'notices', 'lettert', 'json' ) | $raw %]; [% Asset.js("js/letter.js") | $raw %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/letter.js b/koha-tmpl/intranet-tmpl/prog/js/letter.js index 84e63c9d966..b98ff3de566 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/letter.js +++ b/koha-tmpl/intranet-tmpl/prog/js/letter.js @@ -1,5 +1,5 @@ /* Variables defined in letter.tt: */ -/* global _ module add_form copy_form no_op_set code interface theme KohaTable columns_settings */ +/* global _ module add_form copy_form no_op_set code interface theme KohaTable table_settings */ var modal_loading = "
\"\" "+ __('Loading...') +"
"; @@ -44,8 +44,7 @@ $(document).ready(function() { var ntable = KohaTable("lettert", { "autoWidth": false, "paging": false, - "aaSorting": [[ 3, "asc" ]], - }, columns_settings); + }, table_settings); if( no_op_set ){ $('#branch').change(function() { -- 2.25.1