X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-table.html;h=42e91f00c065d2e1b5619218ea1d6b79314e37d0;hb=c6782ab85ea83e0c78d85b8975985aac9d467f9d;hp=127028ee58db5e4cea83327ce070790760ff5fd3;hpb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;p=freeside.git diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html index 127028ee5..42e91f00c 100644 --- a/httemplate/elements/select-table.html +++ b/httemplate/elements/select-table.html @@ -8,7 +8,7 @@ Example: # required ## 'table' => 'table_name', - 'name_col' => 'name_column', + 'name_col' => 'name_column', #or method if you pass an order_by #strongly recommended (you want your forms to be "sticky" on errors, right?) 'curr_value' => 'current_value', @@ -181,24 +181,29 @@ if ( $opt{'records'} ) { }); } -unless ( $value < 1 # !$value #ignore negatives too - or ref($value) +if ( ref( $value ) eq 'ARRAY' ) { + $value = { map { $_ => 1 } @$value }; +} + +unless ( !ref($value) && $value < 1 # !$value #ignore negatives too or ! exists( $opt{hashref}->{disabled} ) #?? - or grep { $value == $_->$key() } @records + #or grep { $value == $_->$key() } @records ) { delete $opt{hashref}->{disabled}; - $opt{hashref}->{$key} = $value; - my $record = qsearchs( { - 'table' => $opt{table}, - 'addl_from' => $opt{'addl_from'}, - 'hashref' => $hashref, - 'extra_sql' => $extra_sql, - }); - push @records, $record if $record; -} -if ( ref( $value ) eq 'ARRAY' ) { - $value = { map { $_ => 1 } @$value }; + foreach my $v ( ref($value) ? keys %$value : ($value) ) { + next if grep { $v == $_->$key() } @records; + + $opt{hashref}->{$key} = $v; + my $record = qsearchs( { + 'table' => $opt{table}, + 'addl_from' => $opt{'addl_from'}, + 'hashref' => $hashref, + 'extra_sql' => $extra_sql, + }); + push @records, $record if $record; + + } } my @pre_options = $opt{pre_options} ? @{ $opt{pre_options} } : ();