X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=52fbd37afeeea714623f66364e86a34e4e858d6f;hb=b429a422185206c645c84ec1c3540494d336b943;hp=995bf3b45abaf24a6f75d2c68317662b9217fb01;hpb=002da834587858fe1761816d5127afb05e064a15;p=freeside.git
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 995bf3b45..52fbd37af 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -97,7 +97,7 @@ function randomPass() {
% if ( $domsvc ) {
% my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $domsvc, } );
% if ( $svc_domain ) {
-% $svc_domain{$svc_domain->svcnum} = $svc_domain;
+% $svc_domain{$svc_domain->svcnum} = $svc_domain->domain;
% } else {
% warn "unknown svc_domain.svcnum for svc_acct.domsvc: $domsvc";
% }
@@ -308,11 +308,11 @@ function randomPass() {
<% mt('RADIUS groups') |h %> |
% if ( $part_svc_usergroup->columnflag eq 'F' ) {
- <% join(' ', @groups) %> |
+ <% join(' ', @groupnames) %> |
% } else {
% my $radius_group_selected = '';
% if ( $svc_acct->svcnum ) {
-% $radius_group_selected = join(',',$svc_acct->radius_groups('NUMBERS'));
+% $radius_group_selected = join(',',$svc_acct->radius_groups('groupnum'));
% }
% elsif ( !$svc_acct->svcnum && $part_svc_usergroup->columnflag eq 'D' ) {
% $radius_group_selected = $part_svc_usergroup->columnvalue;
@@ -320,6 +320,7 @@ function randomPass() {
<& /elements/select-radius_group.html,
curr_value => $radius_group_selected,
element_name => 'radius_usergroup',
+ multiple => 1,
&>
|
% }
@@ -449,8 +450,13 @@ unless ( $svcnum || $cgi->param('error') ) { #adding
my $part_svc_usergroup = $part_svc->part_svc_column('usergroup');
#fixed radius groups always override & display
+my @groupnames; # only used for display of Fixed RADIUS groups
if ( $part_svc_usergroup->columnflag eq 'F' ) {
- @groups = split(',', $part_svc_usergroup->columnvalue);
+ @groups = split(',',$part_svc_usergroup->columnvalue);
+ @groupnames = map { $_->long_description }
+ qsearch({ 'table' => 'radius_group',
+ 'extra_sql' => "where groupnum in (".$part_svc_usergroup->columnvalue.")",
+ }) if length($part_svc_usergroup->columnvalue);
}
my $action = $svcnum ? 'Edit' : 'Add';