projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
elements
/
select-table.html
diff --git
a/httemplate/elements/select-table.html
b/httemplate/elements/select-table.html
index
7945bb4
..
6fb6b38
100644
(file)
--- a/
httemplate/elements/select-table.html
+++ b/
httemplate/elements/select-table.html
@@
-51,12
+51,9
@@
Example:
#<SELECT> element
'onchange' => '', #javascript code
#<SELECT> element
'onchange' => '', #javascript code
- #params controlling the <OPTION>s
+ #params
(well, a param)
controlling the <OPTION>s
'extra_option_attributes' => [ 'field' ], #field or method in $table objects
#(are prefixed w/data- per HTML5)
'extra_option_attributes' => [ 'field' ], #field or method in $table objects
#(are prefixed w/data- per HTML5)
- 'hidden_sub' => sub { my $rec = shift; $rec->disabled; }, #sets option hidden att if true
- #won't hide selected options
- #hidden att not supported IE < 11
#special return options
'js_only' => 0, #set true to return only the JS portions (i.e. nothing)
#special return options
'js_only' => 0, #set true to return only the JS portions (i.e. nothing)
@@
-111,10
+108,8
@@
Example:
% $selected = ( ref($value) && $value->{$recvalue} )
% || ( $value && $value eq $recvalue ); #not == because of value_col
% }
% $selected = ( ref($value) && $value->{$recvalue} )
% || ( $value && $value eq $recvalue ); #not == because of value_col
% }
-% $opt{'hidden_sub'} ||= sub { 0 };
<OPTION VALUE="<% $recvalue %>"
<% $selected ? ' SELECTED' : '' %>
<OPTION VALUE="<% $recvalue %>"
<% $selected ? ' SELECTED' : '' %>
- <% (&{$opt{'hidden_sub'}}($record) && !$selected) ? ' hidden' : '' %>
% foreach my $att ( @{ $opt{'extra_option_attributes'} } ) {
data-<% $att %>="<% $record->$att() |h %>"
% }
% foreach my $att ( @{ $opt{'extra_option_attributes'} } ) {
data-<% $att %>="<% $record->$att() |h %>"
% }
@@
-164,7
+159,7
@@
my $key = $opt{'value_col'} || $dbdef_table->primary_key;
my $name_col = $opt{'name_col'};
my $name_col = $opt{'name_col'};
-my $value =
$opt{'curr_value'} ||
$opt{'value'};
+my $value =
exists($opt{'curr_value'}) ? $opt{'curr_value'} :
$opt{'value'};
$value = [ split(/\s*,\s*/, $value) ] if $opt{'multiple'} && $value =~ /,/;
#my $addl_from = $opt{'addl_from'} || '';
$value = [ split(/\s*,\s*/, $value) ] if $opt{'multiple'} && $value =~ /,/;
#my $addl_from = $opt{'addl_from'} || '';
@@
-187,6
+182,7
@@
if ( $opt{'records'} ) {
unless $opt{'presorted'};
} else {
@records = qsearch( {
unless $opt{'presorted'};
} else {
@records = qsearch( {
+ 'select' => $opt{'select'} || '*',
'table' => $opt{'table'},
'addl_from' => $opt{'addl_from'},
'hashref' => $hashref,
'table' => $opt{'table'},
'addl_from' => $opt{'addl_from'},
'hashref' => $hashref,