[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 0eab7643459bbf8626b0e89240d2f5f9d8a957d8

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  0eab7643459bbf8626b0e89240d2f5f9d8a957d8 (commit)
      from  988ca5d2ed7121f00e11456e4919e42529d1aaec (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 0eab7643459bbf8626b0e89240d2f5f9d8a957d8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jan 27 17:07:42 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 58af6bc..7ab08a3 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -117,7 +117,9 @@
                      $f->{'hashref'}     = {
                                             '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 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)