From 8500168c89faa52e8b0e4da97c53c74268f2a7b0 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 6 Nov 2023 14:00:49 +0000 Subject: [PATCH] Bug 35278: Fix warn from column_settings.pl We need to add scalar to the calls. These parameters are not meant to be used as multi_param. Test plan: Try With and without this patch on staff: Try: /cgi-bin/koha/admin/columns_settings.pl => WITHOUT: No warnings => WITH: Same. No change. Try: /cgi-bin/koha/admin/columns_settings.pl?module=acqui&page=basket => WITHOUT: Opens module, scrolls down. CGI::param called in list context in logfile => WITH: Opens module, scrolls down. Try: /cgi-bin/koha/admin/columns_settings.pl?module=acqui&page=basket&table=orders => WITHOUT: Opens module, scrolls down. CGI::param called in list context in logfile => WITH: Opens module, scrolls down. Try: /cgi-bin/koha/admin/columns_settings.pl?module=acqui&module=admin * Hash like: panel => acqui, admin => page, undef => table, undef => modules, $modules (SHIFTED) => WITHOUT: Acqui expanded showing: There is no page using the table configuration in this module. => CGI::param warning in log. => And: Problem = a value of table has been passed to param without key => And: Problem = a value of modules has been passed to param without key => WITH: Only the first module (Acqui) should be expanded. Try: /cgi-bin/koha/admin/columns_settings.pl?module=acqui&module=admin&page=basket&table=orders * Hash like: panel => acqui, admin => page, basket => table, orders => modules, $modules hash (SHIFTED) => WITHOUT: Acqui expanded showing: There is no page using the table configuration in this module. => And: CGI param log warning. => WITH:: Opens Acqui. Second module ignored. Scrolling. Try: /cgi-bin/koha/admin/columns_settings.pl?module=admin&module=acqui&page=basket&table=orders * Hash like: panel => admin, acqui=> page, basket => table, orders => modules, $modules hash (SHIFTED) => WITHOUT: Admin expanded showing: There is no page using the table configuration in this module. => And: CGI param log warning. => WITH: Admin should be expanded (page and table ignored, not in Admin). No scroll. Signed-off-by: Marcel de Rooy Signed-off-by: David Nind Signed-off-by: Emily Lamancusa Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1b11de87b991ddae4d31861c9cdc321ce45d229d) Signed-off-by: Fridolin Somers (cherry picked from commit dbc24ece694b2bc1a56e32ff663765b1f1dd5d1b) Signed-off-by: Pedro Amorim --- admin/columns_settings.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/columns_settings.pl b/admin/columns_settings.pl index 55ebb66e2e..7fd2c1b18c 100755 --- a/admin/columns_settings.pl +++ b/admin/columns_settings.pl @@ -74,9 +74,9 @@ if ( $action eq 'save' ) { if ( $action eq 'list' ) { my $modules = C4::Utils::DataTables::TablesSettings::get_modules; $template->param( - panel => defined $input->param('module') ? $input->param('module') : undef, - page => defined $input->param('page') ? $input->param('page') : undef, - table => defined $input->param('table') ? $input->param('table') : undef, + panel => scalar $input->param('module'), + page => scalar $input->param('page'), + table => scalar $input->param('table'), modules => $modules, ); } -- 2.39.5