[freeside-commits] branch master updated. 1f688eba76414dfb81882d3ac800a6710312202a

[Jonathan Prykop]

The branch, master has been updated
       via  1f688eba76414dfb81882d3ac800a6710312202a (commit)
      from  0cf5ea1f85245f80e595f853b86aee03e3438042 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1f688eba76414dfb81882d3ac800a6710312202a
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Sat Sep 19 20:32:00 2015 -0500

    RT#37488: Tower/sector selection box is showing disabled towers [removed disabled when using tower_sector]

diff --git a/httemplate/elements/select-tower_sector.html b/httemplate/elements/select-tower_sector.html
index 458bcdd..76ff252 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 => ' ',
     @_ 

-----------------------------------------------------------------------

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