diff options
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/select-table.html | 7 | ||||
| -rw-r--r-- | httemplate/elements/select-tower_sector.html | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html index 4ac0887fd..8aaa58db2 100644 --- a/httemplate/elements/select-table.html +++ b/httemplate/elements/select-table.html @@ -90,6 +90,7 @@ Example: <OPTION VALUE=""><% $opt{'empty_label'} || 'all' %></OPTION> % } +% my $curr_option_found; % # 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() @@ -107,6 +108,7 @@ Example: % $selected = ( ref($value) && $value->{$recvalue} ) % || ( $value && $value eq $recvalue ); #not == because of value_col % } +% $curr_option_found = $selected unless $curr_option_found; <OPTION VALUE="<% $recvalue %>" <% $selected ? ' SELECTED' : '' %> % foreach my $att ( @{ $opt{'extra_option_attributes'} } ) { @@ -128,6 +130,11 @@ Example: <OPTION VALUE="<% $post_opt %>" <% $selected ? 'SELECTED' : '' %> ><% $post_label %></OPTION> +% } + +% my $non_option_label = $opt{'non_option_label'}; +% if (!$curr_option_found && $non_option_label && $value) { + <OPTION VALUE="<% $value %>" SELECTED><% $non_option_label %></OPTION> % } </SELECT> diff --git a/httemplate/elements/select-tower_sector.html b/httemplate/elements/select-tower_sector.html index 76ff25223..4dfd23dcc 100644 --- a/httemplate/elements/select-tower_sector.html +++ b/httemplate/elements/select-tower_sector.html @@ -3,7 +3,7 @@ table => 'tower_sector', name_col => 'description', addl_from => 'JOIN tower USING (towernum)', - extra_sql => q(WHERE disabled = '' OR disabled IS NULL), + extra_sql => $extra_sql, order_by => 'ORDER BY towernum,sectorname', empty_label => ' ', @_ @@ -67,4 +67,7 @@ foreach my $towernum (keys %sectors_of) { } my $empty_label = $opt{'empty_label'} || 'Include services with no sector'; + +my $extra_sql = q(WHERE (disabled = '' OR disabled IS NULL)); +$extra_sql .= q( AND sectorname != '_default') if $opt{'sectorsonly'}; </%init> |