diff options
| author | levinse <levinse> | 2011-06-29 03:51:11 +0000 |
|---|---|---|
| committer | levinse <levinse> | 2011-06-29 03:51:11 +0000 |
| commit | 9324c64e784a866c4d615773c8ce5970cc0d6ed8 (patch) | |
| tree | 122470b7257e1fbef756501fd3a02890d22912c0 /httemplate | |
| parent | 44f5aa6d692b460cc34bc44810fab8e4c3e37b68 (diff) | |
re-write RADIUS groups, RT13274
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/edit/svc_acct.cgi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 995bf3b..1271237 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -308,7 +308,7 @@ function randomPass() { <TR> <TD ALIGN="right"><% mt('RADIUS groups') |h %></TD> % if ( $part_svc_usergroup->columnflag eq 'F' ) { - <TD BGCOLOR="#eeeeee"><% join('<BR>', @groups) %></TD> + <TD BGCOLOR="#eeeeee"><% join('<BR>', @groupnames) %></TD> % } else { % my $radius_group_selected = ''; % if ( $svc_acct->svcnum ) { @@ -449,8 +449,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 { $_->description . " (" . $_->groupname . ")" } + qsearch({ 'table' => 'radius_group', + 'extra_sql' => "where groupnum in (".$part_svc_usergroup->columnvalue.")", + }); } my $action = $svcnum ? 'Edit' : 'Add'; |