X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a5a7ff06d7ed7396e2efbe778c961e2784cb771b..c061f3073396865dc7ea45eda1214cf18746b50e:/SL/CVar.pm diff --git a/SL/CVar.pm b/SL/CVar.pm index a55cdf439..0099b7cbf 100644 --- a/SL/CVar.pm +++ b/SL/CVar.pm @@ -1,5 +1,7 @@ package CVar; +use strict; + use List::Util qw(first); use Data::Dumper; @@ -242,6 +244,8 @@ sub get_custom_variables { : $act_var->{text_value}; $cvar->{valid} = $act_var->{valid}; } else { + $cvar->{valid} = 1; + if ($cvar->{type} eq 'date') { if ($cvar->{default_value} eq 'NOW') { $cvar->{value} = $cvar->{current_date}; @@ -349,7 +353,7 @@ sub save_custom_variables { } sub render_inputs { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my $self = shift; my %params = @_; @@ -370,7 +374,7 @@ sub render_inputs { $var->{VALID_BOX} = $form->parse_html_template('amcvar/render_checkboxes', { var => $var, %options }); } - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); } sub render_search_options { @@ -384,6 +388,8 @@ sub render_search_options { my $myconfig = \%main::myconfig; my $form = $main::form; + $params{hidden_cvar_filters} = $myconfig->{hide_cvar_search_options}; + $params{include_prefix} = 'l_' unless defined($params{include_prefix}); $params{include_value} ||= '1'; @@ -530,7 +536,8 @@ sub add_custom_variables_to_report { # allow sub_module to be a coderef or a fixed value if (ref $params{sub_module} ne 'CODE') { - $params{sub_module} = sub { "$params{sub_module}" }; + my $sub_module = "$params{sub_module}"; + $params{sub_module} = sub { $sub_module }; } my %cfg_map = map { $_->{id} => $_ } @{ $configs }; @@ -654,7 +661,7 @@ sub save_custom_variables_validity { } sub get_custom_variables_validity { - $main::lxdebug->enter_sub(); + $main::lxdebug->enter_sub(2); my $self = shift; my %params = @_; @@ -670,7 +677,7 @@ sub get_custom_variables_validity { my ($invalid) = selectfirst_array_query($form, $dbh, $query, conv_i($params{config_id}), conv_i($params{trans_id})); - $main::lxdebug->leave_sub(); + $main::lxdebug->leave_sub(2); return !$invalid; }