RT# 83039 - only towers with sectors shown on provisioning page when export requires sectors

Conflicts:
	httemplate/elements/select-table.html

1 files changed, 7 insertions, 0 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>