From 9d26680ff0f7965644fcf1c566b501477cf036b0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 16 Dec 2021 12:15:10 +0100 Subject: [PATCH] Bug 29648: Authorised values view No change is expected on this view as the table is not part of the table settings. Signed-off-by: Owen Leonard --- .../prog/en/includes/columns_settings.inc | 40 ++++++++++--------- .../en/modules/admin/authorised_values.tt | 3 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc index 8eca9c2f239..424fcf07de2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -9,21 +9,23 @@ function KohaTable(id_selector, dt_parameters, table_settings, add_filters) { var included_ids = []; var selector = '#' + id_selector; - var columns_settings = table_settings['columns']; + if ( table_settings ) { + var columns_settings = table_settings['columns']; - $(columns_settings).each( function() { - var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', selector ).index( selector + ' th' ); - var used_id = dt_parameters.bKohaColumnsUseNames ? named_id : counter; - if ( used_id == -1 ) return; + $(columns_settings).each( function() { + var named_id = $( 'thead th[data-colname="' + this.columnname + '"]', selector ).index( selector + ' th' ); + var used_id = dt_parameters.bKohaColumnsUseNames ? named_id : counter; + if ( used_id == -1 ) return; - if ( this['is_hidden'] == "1" ) { - hidden_ids.push( used_id ); - } - if ( this['cannot_be_toggled'] == "0" ) { - included_ids.push( used_id ); - } - counter++; - }); + if ( this['is_hidden'] == "1" ) { + hidden_ids.push( used_id ); + } + if ( this['cannot_be_toggled'] == "0" ) { + included_ids.push( used_id ); + } + counter++; + }); + } var exportColumns = ":visible:not(.noExport)"; var exportRows = ":visible:not(.noExport)"; @@ -184,11 +186,13 @@ function KohaTable(id_selector, dt_parameters, table_settings, add_filters) { }); } - if ( table_settings.hasOwnProperty('default_display_length') && table_settings['default_display_length'] != null ) { - new_parameters["pageLength"] = table_settings['default_display_length']; - } - if ( table_settings.hasOwnProperty('default_sort_order') && table_settings['default_sort_order'] != null ) { - new_parameters["order"] = [[ table_settings['default_sort_order'], 'asc' ]]; + if ( table_settings ) { + if ( table_settings.hasOwnProperty('default_display_length') && table_settings['default_display_length'] != null ) { + new_parameters["pageLength"] = table_settings['default_display_length']; + } + if ( table_settings.hasOwnProperty('default_sort_order') && table_settings['default_sort_order'] != null ) { + new_parameters["order"] = [[ table_settings['default_sort_order'], 'asc' ]]; + } } table.dataTable(new_parameters); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index e2ccd1a83e2..04c7c87731e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -429,12 +429,11 @@ [% INCLUDE 'columns_settings.inc' %]