From c343a96200d77a6154e5a8824767e85ff182e74b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 3 Oct 2024 10:44:01 +0200 Subject: [PATCH] Bug 33484: Add tables_settings.default_save_state_search Signed-off-by: Pedro Amorim Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize --- admin/columns_settings.yml | 3 +++ installer/data/mysql/atomicupdate/bug_33484.pl | 7 +++++++ installer/data/mysql/kohastructure.sql | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 1 - 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 5b441fbb1e5..e318746cb7f 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -116,6 +116,7 @@ modules: parcel: pending_orders: + default_save_state_search: 1 columns: - columnname: checkbox @@ -213,6 +214,7 @@ modules: suggestions: suggestions: + default_save_state_search: 1 columns: - columnname: selections @@ -1960,6 +1962,7 @@ modules: circ-overdues: default_display_length: 20 default_sort_order: 0 + default_save_state_search: 1 columns: - columnname: due_date diff --git a/installer/data/mysql/atomicupdate/bug_33484.pl b/installer/data/mysql/atomicupdate/bug_33484.pl index a99d3a55d17..29f1102413d 100755 --- a/installer/data/mysql/atomicupdate/bug_33484.pl +++ b/installer/data/mysql/atomicupdate/bug_33484.pl @@ -13,5 +13,12 @@ return { }); say $out "Added column 'tables_settings.default_save_state'"; } + if ( !column_exists( 'tables_settings', 'default_save_state_search' ) ) { + $dbh->do(q{ + ALTER TABLE tables_settings + ADD COLUMN default_save_state_search tinyint(1) DEFAULT 0 AFTER default_save_state + }); + say $out "Added column 'tables_settings.default_save_state_search'"; + } }, }; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 9675680e976..718565cddef 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -6239,6 +6239,7 @@ CREATE TABLE `tables_settings` ( `default_display_length` smallint(6) DEFAULT NULL, `default_sort_order` varchar(255) DEFAULT NULL, `default_save_state` tinyint(1) DEFAULT 1, + `default_save_state_search` tinyint(1) DEFAULT 0, PRIMARY KEY (`module`(191),`page`(191),`tablename`(191)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index ee605f66d63..5257c3dcc4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -374,7 +374,7 @@ if ( $("#receivedt").length ) { var receivedt = $("#receivedt").dataTable($.extend(true, {}, dataTablesDefaults, { - "stateSave": true, + "stateSave": true, // We do not have table settings on this table "pageLength": 10, "lengthMenu": [[5, 10, 20, 50, 100, -1], [5, 10, 20, 50, 100, _("All")]], "columnDefs": [ @@ -413,7 +413,6 @@ "current_item_level_holds+count", "items" ], - "stateSave": true, // remember state on page reload "columns": [ { "data": "basket.name", "searchable": true, 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 f83ad1a9f21..b78a0c302c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -339,7 +339,6 @@ KohaTable("overduest", { "pagingType": "full", "autoWidth": false, - "stateSave": true }, table_settings); $("#showall").on("change", function(){ -- 2.34.1