projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vor dem Locken von Tabellen Transaktion starten
[kivitendo-erp.git]
/
SL
/
CVar.pm
diff --git
a/SL/CVar.pm
b/SL/CVar.pm
index
7f82a2d
..
0de9a4b
100644
(file)
--- a/
SL/CVar.pm
+++ b/
SL/CVar.pm
@@
-30,6
+30,7
@@
sub get_configs {
FROM custom_variable_configs $where ORDER BY sortkey
SQL
FROM custom_variable_configs $where ORDER BY sortkey
SQL
+ $::form->{CVAR_CONFIGS} = {} unless 'HASH' eq ref $::form->{CVAR_CONFIGS};
if (!$::form->{CVAR_CONFIGS}->{$params{module}}) {
my $configs = selectall_hashref_query($form, $dbh, $query, @values);
if (!$::form->{CVAR_CONFIGS}->{$params{module}}) {
my $configs = selectall_hashref_query($form, $dbh, $query, @values);
@@
-224,7
+225,7
@@
sub get_custom_variables {
$cvar->{OPTIONS} = [ map { { 'value' => $_ } } split(m/\#\#/, $cvar->{options}) ];
}
$cvar->{OPTIONS} = [ map { { 'value' => $_ } } split(m/\#\#/, $cvar->{options}) ];
}
- my
$act_var
;
+ my
($act_var, $valid)
;
if ($params{trans_id}) {
my @values = (conv_i($cvar->{id}), conv_i($params{trans_id}));
push @values, $params{sub_module} if $params{sub_module};
if ($params{trans_id}) {
my @values = (conv_i($cvar->{id}), conv_i($params{trans_id}));
push @values, $params{sub_module} if $params{sub_module};
@@
-232,7
+233,7
@@
sub get_custom_variables {
do_statement($form, $h_var, $q_var, @values);
$act_var = $h_var->fetchrow_hashref();
do_statement($form, $h_var, $q_var, @values);
$act_var = $h_var->fetchrow_hashref();
- $
act_var->{valid}
= $self->get_custom_variables_validity(config_id => $cvar->{id}, trans_id => $params{trans_id});
+ $
valid
= $self->get_custom_variables_validity(config_id => $cvar->{id}, trans_id => $params{trans_id});
}
if ($act_var) {
}
if ($act_var) {
@@
-241,7
+242,7
@@
sub get_custom_variables {
: $cvar->{type} eq 'number' ? $act_var->{number_value}
: $cvar->{type} eq 'bool' ? $act_var->{bool_value}
: $act_var->{text_value};
: $cvar->{type} eq 'number' ? $act_var->{number_value}
: $cvar->{type} eq 'bool' ? $act_var->{bool_value}
: $act_var->{text_value};
- $cvar->{valid} = $
act_var->{valid}
;
+ $cvar->{valid} = $
valid
;
} else {
$cvar->{valid} = 1;
} else {
$cvar->{valid} = 1;