X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-tower_sector.html;fp=httemplate%2Felements%2Fselect-tower_sector.html;h=a16d3bfa005279ee0e41558e1fcd7cc89b5bc66b;hb=c81adbf7bbaa537b650f39bb76ce0b7b8c069450;hp=c783c4b571d9a31d0440df0e2bc184c1f5c61df3;hpb=8e4c66cfb8aaf0aee2d1142636e53d0e17d11d4f;p=freeside.git

diff --git a/httemplate/elements/select-tower_sector.html b/httemplate/elements/select-tower_sector.html
index c783c4b57..a16d3bfa0 100644
--- a/httemplate/elements/select-tower_sector.html
+++ b/httemplate/elements/select-tower_sector.html
@@ -40,12 +40,28 @@ change_towernum('');
 my %opt = @_;
 
 my %sectors_of;
+my %default_of;
 if ( $opt{'multiple'} ) {
   foreach my $sector ( qsearch('tower_sector',{}) ) {
     $sectors_of{$sector->towernum} ||= {};
     $sectors_of{$sector->towernum}->{$sector->sectornum} = $sector->sectorname;
     $sectors_of{''}->{$sector->sectornum} = $sector->description;
+    $default_of{$sector->towernum} = $sector->sectornum
+      if $sector->sectorname eq '_default';
   }
 }
+foreach my $towernum (keys %sectors_of) {
+  # hide default sectors for towers that have real sectors defined
+  my $sectornum = $default_of{$towernum};
+  if ( keys %{ $sectors_of{$towernum} } > 1 ) {
+    delete $sectors_of{$towernum}->{$sectornum};
+    delete $sectors_of{''}->{$sectornum};
+  }
+  else {
+  # show default sectorname as '(all)'
+    $sectors_of{$towernum}->{$sectornum} = '(all)'
+  }
+}
+
 my $empty_label = $opt{'empty_label'} || 'Include services with no tower/sector';
 </%init>