diff options
| author | levinse <levinse> | 2011-07-01 06:54:03 +0000 |
|---|---|---|
| committer | levinse <levinse> | 2011-07-01 06:54:03 +0000 |
| commit | 4665d5af02f915679207a369222472a25e137c9d (patch) | |
| tree | a86cb48ebf58eca185e4200ae5a89dc340e32429 /httemplate | |
| parent | 4b80fe118da16b21603fcdbd090bc03d8fbf0578 (diff) | |
RADIUS group enhancements, overlimit_groups changes, etc. RT13432
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/config/config-view.cgi | 8 | ||||
| -rwxr-xr-x | httemplate/edit/svc_acct.cgi | 2 | ||||
| -rw-r--r-- | httemplate/elements/select-radius_group.html | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi index 4c90ebb8d..e7cadbe99 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -207,8 +207,16 @@ Click on a configuration value to change it. <tr> <td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff"> +% if ( $i->multiple ) { + <% join('<BR>', + map { $_ . ": " . &{ $i->option_sub }($_) } + $conf->config($i->key,$agentnum) + ) + %> +% } else { <% $conf->config($i->key, $agentnum) %>: <% &{ $i->option_sub }( $conf->config($i->key, $agentnum) ) %> +% } </td> </tr> diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 8fda25033..66b58e2c7 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -452,7 +452,7 @@ my $part_svc_usergroup = $part_svc->part_svc_column('usergroup'); my @groupnames; # only used for display of Fixed RADIUS groups if ( $part_svc_usergroup->columnflag eq 'F' ) { @groups = split(',',$part_svc_usergroup->columnvalue); - @groupnames = map { $_->description . " (" . $_->groupname . ")" } + @groupnames = map { $_->long_description } qsearch({ 'table' => 'radius_group', 'extra_sql' => "where groupnum in (".$part_svc_usergroup->columnvalue.")", }) if length($part_svc_usergroup->columnvalue); diff --git a/httemplate/elements/select-radius_group.html b/httemplate/elements/select-radius_group.html index eeaf5ac55..e1e3c5980 100644 --- a/httemplate/elements/select-radius_group.html +++ b/httemplate/elements/select-radius_group.html @@ -10,7 +10,7 @@ my %opt = @_; -my %groups = map { $_->groupnum => $_->description . " (" . $_->groupname . ")" } +my %groups = map { $_->groupnum => $_->long_description } qsearch('radius_group', {}); my @sel_groups = split(/,/,$opt{'curr_value'}); |