X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=33e5d041404e2c98434f9d93587a817d659be528;hb=9f2280fbce022ab9bcfc46fe94483730b0aeb0f8;hp=44c23f4d235b211142e1d42bc961d4b8d9423361;hpb=b5dbd9e1bcbb701a20ed23e723b1e0105fd7c1a1;p=freeside.git diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 44c23f4d2..33e5d0414 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -1,4 +1,4 @@ -<& /elements/header.html, emt("$action [_1] account",$svc) &> +<& /elements/header.html, mt("$action [_1] account",$svc) &> <& /elements/error.html &> @@ -302,12 +302,21 @@ function randomPass() { <% mt('RADIUS groups') |h %> -% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) { - +% if ( $part_svc_usergroup->columnflag eq 'F' ) { <% join('
', @groups) %> % } else { - - <% FS::svc_acct::radius_usergroup_selector( \@groups ) %> +% my $radius_group_selected = ''; +% if ( $svc_acct->svcnum ) { +% $radius_group_selected = join(',',$svc_acct->radius_groups('NUMBERS')); +% } +% elsif ( !$svc_acct->svcnum && $part_svc_usergroup->columnflag eq 'D' ) { +% $radius_group_selected = $part_svc_usergroup->columnvalue; +% } + <& /elements/select-radius_group.html, + curr_value => $radius_group_selected, + element_name => 'radius_usergroup', + &> + % } @@ -433,9 +442,10 @@ unless ( $svcnum || $cgi->param('error') ) { #adding } +my $part_svc_usergroup = $part_svc->part_svc_column('usergroup'); #fixed radius groups always override & display -if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) { - @groups = split(',', $part_svc->part_svc_column('usergroup')->columnvalue); +if ( $part_svc_usergroup->columnflag eq 'F' ) { + @groups = split(',', $part_svc_usergroup->columnvalue); } my $action = $svcnum ? 'Edit' : 'Add';