X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=66b58e2c715d918e3b5a9c6360f5edc456fbe6ea;hb=dfba562ff61f541ba7c75f2c02b32951b73aa002;hp=e6cd7d86c750c024d9bd2f04902e5420dd452bda;hpb=8ef00c68688492b2afa3dde8d3d467f89f238c40;p=freeside.git
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index e6cd7d86c..66b58e2c7 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -45,9 +45,14 @@ function randomPass() {
<% mt('Username') |h %> |
-
- MAXLENGTH=<% $ulen %>>
- |
+% if ( $svcnum && $conf->exists('svc_acct-no_edit_username') ) {
+ <% $svc_acct->username() %> |
+
+% } else {
+
+ MAXLENGTH=<% $ulen %>>
+ |
+% }
%if ( $part_svc->part_svc_column('_password')->columnflag ne 'F' ) {
@@ -302,12 +307,21 @@ function randomPass() {
<% mt('RADIUS groups') |h %> |
-% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) {
-
- <% join(' ', @groups) %> |
+% if ( $part_svc_usergroup->columnflag eq 'F' ) {
+ <% join(' ', @groupnames) %> |
% } 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 +447,15 @@ 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);
+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 { $_->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';