use strict;
+use Carp;
use List::MoreUtils qw(any);
use List::Util qw(first);
use Scalar::Util qw(blessed);
use SL::DBUtils;
use SL::MoreCommon qw(listify);
+use SL::Presenter::Text;
+use SL::Util qw(trim);
+use SL::DB;
sub get_configs {
$main::lxdebug->enter_sub();
} elsif ($config->{type} eq 'number') {
$config->{precision} = $1 if ($config->{options} =~ m/precision=(\d+)/i);
- } elsif ($config->{type} eq 'textfield') {
+ } elsif ($config->{type} =~ m{^(?:html|text)field$}) {
$config->{width} = 30;
$config->{height} = 5;
$config->{width} = $1 if ($config->{options} =~ m/width=(\d+)/i);
my $custom_variables = $self->get_configs(module => $params{module});
foreach my $cvar (@{ $custom_variables }) {
- if ($cvar->{type} eq 'textfield') {
+ if ($cvar->{type} =~ m{^(?:html|text)field}) {
$cvar->{width} = 30;
$cvar->{height} = 5;
do_statement($form, $h_var, $q_var, @values);
$act_var = $h_var->fetchrow_hashref();
- $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}, sub_module => $params{sub_module});
} else {
$valid = !$cvar->{flag_defaults_to_invalid};
}
}
sub save_custom_variables {
+ my ($self, %params) = @_;
$main::lxdebug->enter_sub();
+ my $rc = SL::DB->client->with_transaction(\&_save_custom_variables, $self, %params);
+
+ $::lxdebug->leave_sub;
+ return $rc;
+}
+
+sub _save_custom_variables {
my $self = shift;
my %params = @_;
my $myconfig = \%main::myconfig;
my $form = $main::form;
- my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
+ my $dbh = $params{dbh} || SL::DB->client->dbh;
my @configs = $params{configs} ? @{ $params{configs} } : grep { $_->{module} eq $params{module} } @{ CVar->get_configs() };
my $sth = prepare_query($form, $dbh, $query);
foreach my $config (@configs) {
+ if ($params{save_validity}) {
+ my $valid_index = "$params{name_prefix}cvar_$config->{name}$params{name_postfix}_valid";
+ my $new_valid = $params{variables}{$valid_index} || $params{always_valid} ? 1 : 0;
+ my $old_valid = $self->get_custom_variables_validity(trans_id => $params{trans_id}, config_id => $config->{id});
+
+ $self->save_custom_variables_validity(trans_id => $params{trans_id},
+ config_id => $config->{id},
+ validity => $new_valid,
+ );
+
+ if (!$new_valid || !$old_valid) {
+ # When activating a cvar (old_valid == 0 && new_valid == 1)
+ # the input to hold the variable's value wasn't actually
+ # rendered, meaning saving the value now would only save an
+ # empty value/the value 0. This means that the next time the
+ # form is rendered, an existing value is found and used
+ # instead of the variable's default value from the
+ # configuration. Therefore don't save the values in such
+ # cases.
+ next;
+ }
+ }
+
my @values = (conv_i($config->{id}), "$params{sub_module}", conv_i($params{trans_id}));
my $value = $params{variables}->{"$params{name_prefix}cvar_$config->{name}$params{name_postfix}"};
- if (($config->{type} eq 'text') || ($config->{type} eq 'textfield') || ($config->{type} eq 'select')) {
+ if (any { $config->{type} eq $_ } qw(text textfield htmlfield select)) {
push @values, undef, undef, $value, undef;
} elsif (($config->{type} eq 'date') || ($config->{type} eq 'timestamp')) {
}
do_statement($form, $sth, $query, @values);
-
- if ($params{save_validity}) {
- 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();
- $dbh->commit() unless $params{dbh};
-
- $main::lxdebug->leave_sub();
+ return 1;
}
sub render_inputs {
my (@sub_values, @sub_where, $not);
- if (($config->{type} eq 'text') || ($config->{type} eq 'textfield')) {
+ if (any { $config->{type} eq $_ } qw(text textfield htmlfield)) {
next unless ($params{filter}->{$name});
push @sub_where, qq|cvar.text_value ILIKE ?|;
- push @sub_values, '%' . $params{filter}->{$name} . '%'
+ push @sub_values, like($params{filter}->{$name});
} elsif ($config->{type} eq 'select') {
next unless ($params{filter}->{$name});
}
push @sub_where, qq|cvar.number_value $op ?|;
- push @sub_values, $form->parse_amount($myconfig, $params{filter}->{$name});
+ push @sub_values, $form->parse_amount($myconfig, trim($params{filter}->{$name}));
} elsif ($config->{type} eq 'bool') {
next unless ($params{filter}->{$name});
my $table = $config->{type};
push @sub_where, qq|cvar.number_value * 1 IN (SELECT id FROM $table WHERE name ILIKE ?)|;
- push @sub_values, "%$params{filter}->{$name}%";
+ push @sub_values, like($params{filter}->{$name});
} elsif ($config->{type} eq 'part') {
next unless $params{filter}->{$name};
push @sub_where, qq|cvar.number_value * 1 IN (SELECT id FROM parts WHERE partnumber ILIKE ?)|;
- push @sub_values, "%$params{filter}->{$name}%";
+ push @sub_values, like($params{filter}->{$name});
}
if (@sub_where) {
: $cfg->{type} eq 'vendor' ? (SL::DB::Manager::Vendor->find_by(id => 1*$ref->{number_value}) || SL::DB::Vendor->new)->name
: $cfg->{type} eq 'part' ? (SL::DB::Manager::Part->find_by(id => 1*$ref->{number_value}) || SL::DB::Part->new)->partnumber
: $cfg->{type} eq 'bool' ? ($ref->{bool_value} ? $locale->text('Yes') : $locale->text('No'))
+ : $cfg->{type} eq 'htmlfield' ? SL::Presenter::Text::stripped_html($ref->{text_value})
: $ref->{text_value};
}
}
}
sub save_custom_variables_validity {
+ my ($self, %params) = @_;
$main::lxdebug->enter_sub();
+ my $rc = SL::DB->client->with_transaction(\&_save_custom_variables_validity, $self, %params);
+
+ $::lxdebug->leave_sub;
+ return $rc;
+}
+
+sub _save_custom_variables_validity {
my $self = shift;
my %params = @_;
my $myconfig = \%main::myconfig;
my $form = $main::form;
- my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
+ my $dbh = $params{dbh} || SL::DB->client->dbh;
my (@where, @values);
add_token(\@where, \@values, col => "config_id", val => $params{config_id}, esc => \&conv_i);
$sth->finish();
- $dbh->commit() unless $params{dbh};
-
- $main::lxdebug->leave_sub();
+ return 1;
}
-sub get_custom_variables_validity {
- $main::lxdebug->enter_sub(2);
+my %_validity_sub_module_mapping = (
+ orderitems => { table => 'orderitems', result_column => 'parts_id', trans_id_column => 'id', },
+ delivery_order_items => { table => 'delivery_order_items', result_column => 'parts_id', trans_id_column => 'id', },
+ invoice => { table => 'invoice', result_column => 'parts_id', trans_id_column => 'id', },
+);
+sub get_custom_variables_validity {
my $self = shift;
my %params = @_;
my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
- my $query = qq|SELECT id FROM custom_variables_validity WHERE config_id = ? AND trans_id = ? LIMIT 1|;
+ my $query;
- my ($invalid) = selectfirst_array_query($form, $dbh, $query, conv_i($params{config_id}), conv_i($params{trans_id}));
+ if ($params{sub_module}) {
+ my %mapping = %{ $_validity_sub_module_mapping{ $params{sub_module} } || croak("Invalid sub_module '" . $params{sub_module} . "'") };
+ $query = <<SQL;
+ SELECT cvv.id
+ FROM $mapping{table} mt
+ LEFT JOIN custom_variables_validity cvv ON (cvv.trans_id = mt.$mapping{result_column})
+ WHERE (cvv.config_id = ?)
+ AND (mt.$mapping{trans_id_column} = ?)
+ LIMIT 1
+SQL
+ } else {
+ $query = <<SQL;
+ SELECT id
+ FROM custom_variables_validity
+ WHERE (config_id = ?)
+ AND (trans_id = ?)
+ LIMIT 1
+SQL
+ }
- $main::lxdebug->leave_sub(2);
+ my ($invalid) = selectfirst_array_query($form, $dbh, $query, conv_i($params{config_id}), conv_i($params{trans_id}));
return !$invalid;
}
Suppose the following scenario:
-You have a lot of parts in your database, and a set of properties cofigured. Now not every part has every of these properties, some combinations will just make no sense. In order to clean up your inputs a bit, you want to mark certain combinations as invalid, blocking them from modification and possibly display.
+You have a lot of parts in your database, and a set of properties configured. Now not every part has every of these properties, some combinations will just make no sense. In order to clean up your inputs a bit, you want to mark certain combinations as invalid, blocking them from modification and possibly display.
Validity is assumed. If you modify validity, you actually save B<invalidity>.
Invalidity is saved as a function of config_id, and the trans_id
projects / kivitendo-erp.git / blobdiff