From 2ff4eb2bcc1f84d588d47fcff06699fc6bfe0bec Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 4 Feb 2019 18:55:38 +0000 Subject: [PATCH] Bug 21852: (follow up) Remove persistent DataTables user configuration This patch removes the DataTables function for restoring a user's previous configuration. --- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/js/datatables.js | 28 ---------------------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index 7213ebc..9b43a2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -278,8 +278,6 @@ $(document).ready(function(){ var columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'overdues', 'circ-overdues', 'json' ) | $raw %]; - var od_table = localStorage.getItem("DataTables_overduest_/cgi-bin/koha/circ/overdue.pl"); - var updated_settings = get_columns_saved_state( od_table, columns_settings ); KohaTable("overduest", { "sPaginationType": "four_button", @@ -290,7 +288,7 @@ ], "autoWidth": false, "stateSave": true - }, updated_settings); + }, columns_settings); }); [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index 0f8fdb4..0e95d1e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -567,31 +567,3 @@ function footer_column_sum( api, column_numbers ) { $( api.column( column_number ).footer() ).html(total.format_price()); }; } - -/* get_columns_saved_state checks for a DataTables configuration saved - * in the browser's local storage. If it is present, the columns - * configuration supplied by Koha is overwritten - * - * It takes two parameters: - * - localstorage_config, the DataTables saved state object from local storage - * - columns_settings, the columns settings object supplied by the template - */ - -function get_columns_saved_state( localstorage_config, columns_settings ){ - var tables = JSON.parse( localstorage_config ); - // if a table configuration was found in local storage, parse it - if( tables ){ - var stateSave_column_visibility = []; - $(tables.columns).each(function(){ - stateSave_column_visibility.push( this.visible === true ? 0 : 1 ); - }); - $.each( columns_settings, function( index, key ){ - if( stateSave_column_visibility[ index ] !== columns_settings[key] ){ - columns_settings[ index ].is_hidden = stateSave_column_visibility[ index ]; - } - }); - return columns_settings; - } else { - return columns_settings; - } -} \ No newline at end of file -- 2.1.4