X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-table.html;h=4ac0887fd51bf95fa0d488cbf6bd580da078d53d;hb=8c914e2614a40b95291df00d0b8dbd5766f611b5;hp=c0dde74147eb1df67743b574f610326942c73c52;hpb=d838063ab25f047e88c3e5ae16f77fc4f3481ce9;p=freeside.git
diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
index c0dde7414..4ac0887fd 100644
--- a/httemplate/elements/select-table.html
+++ b/httemplate/elements/select-table.html
@@ -8,7 +8,8 @@ Example:
# required
##
'table' => 'table_name',
- 'name_col' => 'name_column',
+ 'name_col' => 'name_column', #or method if you pass an order_by
+ # order_by is currently broken, though
#strongly recommended (you want your forms to be "sticky" on errors, right?)
'curr_value' => 'current_value',
@@ -37,6 +38,7 @@ Example:
'post_options' => [ 'value' => 'option' ], #after normal options
'empty_label' => '', #better specify it though, the default might change
'multiple' => 0, # bool
+ 'all_selected' => 0, # useful with multiple
'disable_empty' => 0, # bool (implied by multiple)
'label_showkey' => 0, # bool
'label_callback' => sub { my $record = shift; return "label"; },
@@ -69,23 +71,26 @@ Example:
NAME = "<% $opt{'element_name'} || $opt{'field'} || $key %>"
ID = "<% $opt{'id'} || $key %>"
<% $onchange %>
+ <% $size %>
<% $opt{'element_etc'} %>
>
% while ( @pre_options ) {
% my $pre_opt = shift(@pre_options);
% my $pre_label = shift(@pre_options);
-% my $selected = ( ref($value) && $value->{$pre_opt} )
-% || ( $value eq $pre_opt );
+% my $selected = $opt{'all_selected'}
+% || ( ref($value) && $value->{$pre_opt} )
+% || ( $value eq $pre_opt );
% }
% unless ( $opt{'multiple'} || $opt{'disable_empty'} ) {
-
% }
+% # XXX fix this eventually, when we have time to test it
% foreach my $record ( sort { $a->$name_col() cmp $b->$name_col()
% || $a->$key() <=> $b->$key()
% }
@@ -93,10 +98,17 @@ Example:
% )
% {
% my $recvalue = $record->$key();
+% my $selected;
+% if ( $opt{'all_selected'} ) {
+% $selected = 1;
+% } elsif ( $opt{'compare_sub'} && !ref($value) ) {
+% $selected = &{ $opt{'compare_sub'} }( $value, $recvalue );
+% } else {
+% $selected = ( ref($value) && $value->{$recvalue} )
+% || ( $value && $value eq $recvalue ); #not == because of value_col
+% }
% }
% while ( @post_options ) {
@@ -114,7 +127,7 @@ Example:
% || ( $value eq $post_opt );
% }
@@ -174,27 +187,34 @@ 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} } : ();
my @post_options = $opt{post_options} ? @{ $opt{post_options} } : ();
+my $size = $opt{'size'} ? 'SIZE=' . $opt{'size'} : '';
+
%init>