optimize CDR rating after timed rate perf regression, RT#15739

[freeside.git] / httemplate / edit / part_svc.cgi

diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 97e2d96..e899ad0 100755 (executable)
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -139,7 +139,11 @@ Service  <INPUT TYPE="text" NAME="svc" VALUE="<% $hashref->{svc} %>"><BR>
 %               )
 %        } fields($layer);
 %      }
-%      push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
+%      push @fields, 'usergroup' 
+%        if $layer eq 'svc_acct'
+%          or ( $layer eq 'svc_broadband' and 
+%               $conf->exists('svc_broadband-radius') ); # double kludge
+%               # (but we do want to check the config, right?)
 %      $part_svc->svcpart($clone) if $clone; #haha, undone below
 %
 %
@@ -314,32 +318,17 @@ Service  <INPUT TYPE="text" NAME="svc" VALUE="<% $hashref->{svc} %>"><BR>
 %            qq!<TEXTAREA NAME="${layer}__${field}">!. encode_entities($value).
 %            '</TEXTAREA>';
 %
-%        } elsif ( $def->{type} eq 'select-svc_pbx.html' ) {
+%        } elsif ( $def->{type} =~ /select-(.*?).html/ ) {
 %
-%          $html .= include('/elements/select-svc_pbx.html',
+%          $html .= include("/elements/".$def->{type},
 %                             'curr_value'   => $value,
 %                             'element_name' => "${layer}__${field}",
 %                             'element_etc'  => $disabled,
-%                             'multiple'     => ($flag eq 'S'),
+%                             'multiple'     => ($def->{multiple} ||
+%                                                $flag eq 'S'),
+%                                 # allow the table def to force 'multiple'
 %                          );
 %
-%        } elsif ( $def->{type} eq 'select-lnp_status.html' ) {
-%
-%          $html .= include('/elements/select-lnp_status.html',
-%                             'curr_value'   => $value,
-%                             'element_name' => "${layer}__${field}",
-%                             'element_etc'  => $disabled,
-%                             'multiple'     => ($flag eq 'S'),
-%                          );
-%
-%        } elsif ( $def->{type} eq 'radius_usergroup_selector' ) {
-%
-%          #XXX disable the RADIUS usergroup selector?  ugh it sure does need
-%          #an overhaul, people have dum group problems because of it
-%
-%          $html .= FS::svc_acct::radius_usergroup_selector(
-%            [ split(',', $value) ], "${layer}__${field}" );
-%
 %        } elsif ( $def->{type} eq 'communigate_pro-accessmodes' ) {
 %
 %          $html .= include('/elements/communigate_pro-accessmodes.html',
@@ -417,6 +406,7 @@ Table <% $widget->html %>
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+my $conf = FS::Conf->new;
 my $part_svc;
 my $clone = '';
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {#clone