[freeside-commits] branch master updated. 5ffd80e8e6ac4554fc4515b018eaf0354ebcdc9a

[Ivan]

The branch, master has been updated
       via  5ffd80e8e6ac4554fc4515b018eaf0354ebcdc9a (commit)
      from  48fc9f425ec3454f4346089318994ae6c1e080a8 (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 5ffd80e8e6ac4554fc4515b018eaf0354ebcdc9a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jan 27 17:07:27 2014 -0800

    fix fallout: allowing selectable choice for arbitrary things broke classic selectable choice for domains, RT#25623

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 4131508..fc29327 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -126,7 +126,8 @@
                                             'classnum'=>$columndef->columnvalue
                                            };
 
-                   } elsif ( $flag eq 'S' ) { #selectable choice
+                   } elsif ( $flag eq 'S' #selectable choice
+                               && $f->{type} !~ /^select-svc(-domain|_pbx)$/ ) {
                      $f->{type}    = 'select';
                      $f->{options} = [ split( /\s*,\s*/,
                                                 $columndef->columnvalue)

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

Summary of changes:
 httemplate/edit/elements/svc_Common.html |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)