From 66fc0c9ba5d3f460a26a51ee72ee25923d644da8 Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Sun, 21 Apr 2019 16:14:13 -0400
Subject: RT# 83039 - only towers with sectors shown on provisioning page when
 export requires sectors

---
 httemplate/elements/select-table.html        | 7 +++++++
 httemplate/elements/select-tower_sector.html | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'httemplate/elements')

diff --git a/httemplate/elements/select-table.html b/httemplate/elements/select-table.html
index d86b7ee43..ecac7f765 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;
 % foreach my $record ( 
 % # we have the order_by parameter for this
 % #sort {    $a->$name_col() cmp $b->$name_col()
@@ -108,6 +109,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'} } ) {
@@ -129,6 +131,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>
-- 
cgit v1.2.1