}
$self->_unpack_flags($config);
+
+ my $cvar_config = SL::DB::CustomVariableConfig->new(id => $config->{id})->load;
+ @{$config->{'partsgroups'}} = map {$_->id} @{$cvar_config->partsgroups};
+
}
$::form->{CVAR_CONFIGS}->{$params{module}} = $configs;
}
my $dbh = $params{dbh} || $form->get_standard_dbh($myconfig);
- my $trans_id = $params{trans_id} ? 'OR (v.trans_id = ?) ' : '';
+ my $sub_module = $params{sub_module} ? $params{sub_module} : '';
my $q_var =
qq|SELECT text_value, timestamp_value, timestamp_value::date AS date_value, number_value, bool_value
FROM custom_variables
- WHERE (config_id = ?) AND (trans_id = ?)|;
- $q_var .= qq| AND (sub_module = ?)| if $params{sub_module};
+ WHERE (config_id = ?) AND (trans_id = ?) AND (sub_module = ?)|;
my $h_var = prepare_query($form, $dbh, $q_var);
my $custom_variables = $self->get_configs(module => $params{module});
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};
+ my @values = (conv_i($cvar->{id}), conv_i($params{trans_id}), $sub_module);
do_statement($form, $h_var, $q_var, @values);
$act_var = $h_var->fetchrow_hashref();
my $myconfig = \%main::myconfig;
my $form = $main::form;
- my %options = ( name_prefix => "$params{name_prefix}",
- name_postfix => "$params{name_postfix}",
- hide_non_editable => $params{hide_non_editable},
+ my %options = ( name_prefix => "$params{name_prefix}",
+ name_postfix => "$params{name_postfix}",
+ hide_non_editable => $params{hide_non_editable},
show_disabled_message => $params{show_disabled_message},
);
+ # should this cvar be filtered by partsgroups?
foreach my $var (@{ $params{variables} }) {
+ if ($var->{flag_partsgroup_filter}) {
+ if (!$params{partsgroup_id} || (!grep {$params{partsgroup_id} == $_} @{ $var->{partsgroups} })) {
+ $var->{partsgroup_filtered} = 1;
+ }
+ }
+
$var->{HTML_CODE} = $form->parse_html_template('amcvar/render_inputs', { var => $var, %options });
$var->{VALID_BOX} = $form->parse_html_template('amcvar/render_checkboxes', { var => $var, %options });
}