From 1c2d89df87d381d8babd5dac269b6baf2cb2df13 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 30 Oct 2024 23:07:50 +0000 Subject: [PATCH] Bug 37238: (follow-up) Deal with table state, remove sharable link --- .../prog/en/includes/columns_settings.inc | 2 +- .../prog/en/modules/admin/columns_settings.tt | 42 ++++++++++--------- 2 files changed, 23 insertions(+), 21 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 46411008b07..b44b1039bb4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -215,7 +215,7 @@ function KohaTable(id_selector, dt_parameters, table_settings, add_filters) { } ); - if ( table_settings ) { + if ( table_settings && ( table_settings.hasOwnProperty('default_save_state') && table_settings['default_save_state'] !== 0 ) ) { dt_parameters["buttons"].push( { autoClose: true, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt index 8bf0b32d448..b71c75440df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -149,26 +149,28 @@

[% END %] -

- [% SET option_name = pagename _ "|" _ tablename _ "_default_save_state" %] - - [%- IF table_settings.default_save_state -%] - - [%- ELSE -%] - - [%- END -%] -

- -

- [% SET option_name = pagename _ "|" _ tablename _ "_default_save_state_search" %] - - [%- IF table_settings.default_save_state_search -%] - - [%- ELSE -%] - - [%- END -%] -

- + [% IF table_settings.default_save_state %] +

+ [% SET option_name = pagename _ "|" _ tablename _ "_default_save_state" %] + + [%- IF table_settings.default_save_state -%] + + [%- ELSE -%] + + [%- END -%] +

+ [% END %] + [% IF table_settings.default_save_state_search %] +

+ [% SET option_name = pagename _ "|" _ tablename _ "_default_save_state_search" %] + + [%- IF table_settings.default_save_state_search -%] + + [%- ELSE -%] + + [%- END -%] +

+ [% END %] [% END %]
-- 2.39.2