From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 28 Jan 2014 01:07:42 +0000 (-0800)
Subject: fix fallout: allowing selectable choice for arbitrary things broke classic selectable... 
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=0eab7643459bbf8626b0e89240d2f5f9d8a957d8

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 58af6bc83..7ab08a355 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)