projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
print_options: fieses refkonstrukt umgeschrieben.
[kivitendo-erp.git]
/
SL
/
CVar.pm
diff --git
a/SL/CVar.pm
b/SL/CVar.pm
index
a55cdf4
..
f9e2d8a
100644
(file)
--- a/
SL/CVar.pm
+++ b/
SL/CVar.pm
@@
-1,5
+1,7
@@
package CVar;
package CVar;
+use strict;
+
use List::Util qw(first);
use Data::Dumper;
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 {
: $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};
if ($cvar->{type} eq 'date') {
if ($cvar->{default_value} eq 'NOW') {
$cvar->{value} = $cvar->{current_date};
@@
-384,6
+388,8
@@
sub render_search_options {
my $myconfig = \%main::myconfig;
my $form = $main::form;
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';
$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') {
# 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 };
}
my %cfg_map = map { $_->{id} => $_ } @{ $configs };