X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=61058aeb29107d13d4a0119e5c097ce59271753e;hb=ac87fa478e6eed0d52704baf58e44860efaae67f;hp=33e5d041404e2c98434f9d93587a817d659be528;hpb=9f2280fbce022ab9bcfc46fe94483730b0aeb0f8;p=freeside.git
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 33e5d0414..61058aeb2 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' ) {
@@ -92,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";
% }
@@ -303,7 +308,7 @@ 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 ) {
@@ -444,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 { $_->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';