Marcel de Rooy
1b11de87b9
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 <m.de.rooy@rijksmuseum.nl> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
84 lines
2.8 KiB
Perl
Executable file
84 lines
2.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
use Modern::Perl;
|
|
use CGI;
|
|
use C4::Auth qw( get_template_and_user );
|
|
use C4::Context;
|
|
use C4::Output qw( output_html_with_http_headers );
|
|
use C4::Utils::DataTables::TablesSettings qw( get_modules );
|
|
my $input = CGI->new;
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "admin/columns_settings.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
flagsrequired => { parameters => 'manage_column_config' },
|
|
}
|
|
);
|
|
|
|
my $action = $input->param('action') // 'list';
|
|
|
|
if ( $action eq 'save' ) {
|
|
my $module = $input->param('module');
|
|
my @columnids = $input->multi_param("columnid");
|
|
my @columns;
|
|
for my $columnid (@columnids) {
|
|
next unless $columnid =~ m|^([^#]*)#([^#]*)#(.*)$|;
|
|
my $is_hidden = $input->param( $columnid . '_hidden' ) // 0;
|
|
my $cannot_be_toggled =
|
|
$input->param( $columnid . '_cannot_be_toggled' ) // 0;
|
|
push @columns,
|
|
{
|
|
module => $module,
|
|
page => $1,
|
|
tablename => $2,
|
|
columnname => $3,
|
|
is_hidden => $is_hidden,
|
|
cannot_be_toggled => $cannot_be_toggled,
|
|
};
|
|
}
|
|
|
|
C4::Utils::DataTables::TablesSettings::update_columns(
|
|
{
|
|
columns => \@columns,
|
|
}
|
|
);
|
|
|
|
my @table_ids = $input->multi_param('table_id');
|
|
for my $table_id (@table_ids) {
|
|
next unless $table_id =~ m|^([^#]*)#(.*)$|;
|
|
my $default_display_length = $input->param( $table_id . '_default_display_length' );
|
|
my $default_sort_order = $input->param( $table_id . '_default_sort_order' );
|
|
|
|
undef $default_display_length if defined $default_display_length && $default_display_length eq "";
|
|
undef $default_sort_order if defined $default_sort_order && $default_sort_order eq "";
|
|
|
|
if ( defined $default_display_length || defined $default_sort_order )
|
|
{
|
|
C4::Utils::DataTables::TablesSettings::update_table_settings(
|
|
{
|
|
module => $module,
|
|
page => $1,
|
|
tablename => $2,
|
|
default_display_length => $default_display_length,
|
|
default_sort_order => $default_sort_order,
|
|
}
|
|
);
|
|
}
|
|
}
|
|
|
|
$action = 'list';
|
|
}
|
|
|
|
if ( $action eq 'list' ) {
|
|
my $modules = C4::Utils::DataTables::TablesSettings::get_modules;
|
|
$template->param(
|
|
panel => scalar $input->param('module'),
|
|
page => scalar $input->param('page'),
|
|
table => scalar $input->param('table'),
|
|
modules => $modules,
|
|
);
|
|
}
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|