projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Steuerzone darf nicht leer sein
[kivitendo-erp.git]
/
SL
/
CVar.pm
diff --git
a/SL/CVar.pm
b/SL/CVar.pm
index
8ecda74
..
8c4f6a8
100644
(file)
--- a/
SL/CVar.pm
+++ b/
SL/CVar.pm
@@
-25,25
+25,31
@@
sub get_configs {
push @values, $params{module};
}
push @values, $params{module};
}
- my $query = qq|SELECT * FROM custom_variable_configs $where ORDER BY sortkey|;
+ my $query = <<SQL;
+ SELECT *, date_trunc('seconds', localtimestamp) AS current_timestamp
+ FROM custom_variable_configs $where ORDER BY sortkey
+SQL
- my $configs = selectall_hashref_query($form, $dbh, $query, @values);
+ if (!$::form->{CVAR_CONFIGS}->{$params{module}}) {
+ my $configs = selectall_hashref_query($form, $dbh, $query, @values);
- foreach my $config (@{ $configs }) {
- if ($config->{type} eq 'select') {
- $config->{OPTIONS} = [ map { { 'value' => $_ } } split(m/\#\#/, $config->{options}) ];
+
foreach my $config (@{ $configs }) {
+
if ($config->{type} eq 'select') {
+
$config->{OPTIONS} = [ map { { 'value' => $_ } } split(m/\#\#/, $config->{options}) ];
- } elsif ($config->{type} eq 'number') {
- $config->{precision} = $1 if ($config->{options} =~ m/precision=(\d+)/i);
+
} elsif ($config->{type} eq 'number') {
+
$config->{precision} = $1 if ($config->{options} =~ m/precision=(\d+)/i);
- }
+
}
- $self->_unpack_flags($config);
+ $self->_unpack_flags($config);
+ }
+ $::form->{CVAR_CONFIGS}->{$params{module}} = $configs;
}
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
- return $
configs
;
+ return $
::form->{CVAR_CONFIGS}->{$params{module}}
;
}
sub get_config {
}
sub get_config {
@@
-191,13
+197,6
@@
sub get_custom_variables {
my $trans_id = $params{trans_id} ? 'OR (v.trans_id = ?) ' : '';
my $trans_id = $params{trans_id} ? 'OR (v.trans_id = ?) ' : '';
- my $q_cfg =
- qq|SELECT id, name, description, type, default_value, options,
- date_trunc('seconds', localtimestamp) AS current_timestamp, current_date AS current_date
- FROM custom_variable_configs
- WHERE module = ?
- ORDER BY sortkey|;
-
my $q_var =
qq|SELECT text_value, timestamp_value, timestamp_value::date AS date_value, number_value, bool_value
FROM custom_variables
my $q_var =
qq|SELECT text_value, timestamp_value, timestamp_value::date AS date_value, number_value, bool_value
FROM custom_variables
@@
-205,7
+204,7
@@
sub get_custom_variables {
$q_var .= qq| AND (sub_module = ?)| if $params{sub_module};
my $h_var = prepare_query($form, $dbh, $q_var);
$q_var .= qq| AND (sub_module = ?)| if $params{sub_module};
my $h_var = prepare_query($form, $dbh, $q_var);
- my $custom_variables =
selectall_hashref_query($form, $dbh, $q_cfg,
$params{module});
+ my $custom_variables =
$self->get_configs(module =>
$params{module});
foreach my $cvar (@{ $custom_variables }) {
if ($cvar->{type} eq 'textfield') {
foreach my $cvar (@{ $custom_variables }) {
if ($cvar->{type} eq 'textfield') {
@@
-225,7
+224,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};
@@
-233,7
+232,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) {
@@
-242,7
+241,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;
@@
-338,11
+337,10
@@
sub save_custom_variables {
do_statement($form, $sth, $query, @values);
do_statement($form, $sth, $query, @values);
- unless ($params{always_valid}) {
- $self->save_custom_variables_validity(trans_id => $params{trans_id}, config_id => $config->{id},
- validity => ($params{variables}->{"$params{name_prefix}cvar_$config->{name}$params{name_postfix}_valid"} ? 1 : 0)
- );
- };
+ my $valid_index = "$params{name_prefix}cvar_$config->{name}$params{name_postfix}_valid";
+ $self->save_custom_variables_validity(trans_id => $params{trans_id}, config_id => $config->{id},
+ validity => ($params{variables}{$valid_index} || $params{always_valid} ? 1 : 0)
+ );
}
$sth->finish();
}
$sth->finish();