From 6163b943f45e083a87cc03344eb775a9edd553ce Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Mon, 31 Aug 2015 22:16:37 -0700
Subject: allow services with a tower but no sector to appear in search
 results, #33056

---
 httemplate/elements/select-tower_sector.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/elements/select-tower_sector.html')

diff --git a/httemplate/elements/select-tower_sector.html b/httemplate/elements/select-tower_sector.html
index a16d3bfa0..59b016359 100644
--- a/httemplate/elements/select-tower_sector.html
+++ b/httemplate/elements/select-tower_sector.html
@@ -12,7 +12,7 @@
     table       => 'tower',
     name_col    => 'towername',
     id          => 'towernum',
-    field       => 'dummy_towernum',
+    field       => 'towernum',
     onchange    => 'change_towernum(this.value);',
     element_etc => 'STYLE="vertical-align:top"',
 &>
@@ -63,5 +63,5 @@ foreach my $towernum (keys %sectors_of) {
   }
 }
 
-my $empty_label = $opt{'empty_label'} || 'Include services with no tower/sector';
+my $empty_label = $opt{'empty_label'} || 'Include services with no sector';
 </%init>
-- 
cgit v1.2.1


From 58d388d4354f18477e9863ad95c78e73772d1768 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 14 Sep 2015 13:01:38 -0700
Subject: don't show disabled towers in dropdown, RT#37488

---
 httemplate/elements/select-tower_sector.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'httemplate/elements/select-tower_sector.html')

diff --git a/httemplate/elements/select-tower_sector.html b/httemplate/elements/select-tower_sector.html
index 59b016359..458bcddcf 100644
--- a/httemplate/elements/select-tower_sector.html
+++ b/httemplate/elements/select-tower_sector.html
@@ -11,6 +11,7 @@
 <& /elements/select-table.html,
     table       => 'tower',
     name_col    => 'towername',
+    hashref     => { 'disabled' => '', },
     id          => 'towernum',
     field       => 'towernum',
     onchange    => 'change_towernum(this.value);',
-- 
cgit v1.2.1


From 1f688eba76414dfb81882d3ac800a6710312202a Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Sat, 19 Sep 2015 20:32:00 -0500
Subject: RT#37488: Tower/sector selection box is showing disabled towers
 [removed disabled when using tower_sector]

---
 httemplate/elements/select-tower_sector.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'httemplate/elements/select-tower_sector.html')

diff --git a/httemplate/elements/select-tower_sector.html b/httemplate/elements/select-tower_sector.html
index 458bcddcf..76ff25223 100644
--- a/httemplate/elements/select-tower_sector.html
+++ b/httemplate/elements/select-tower_sector.html
@@ -2,6 +2,8 @@
 <& /elements/select-table.html,
     table       => 'tower_sector',
     name_col    => 'description',
+    addl_from   => 'JOIN tower USING (towernum)',
+    extra_sql   => q(WHERE disabled = '' OR disabled IS NULL),
     order_by    => 'ORDER BY towernum,sectorname',
     empty_label => ' ',
     @_ 
-- 
cgit v1.2.1