[freeside-commits] freeside/httemplate/edit svc_acct.cgi, 1.77, 1.78

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv21472/httemplate/edit

Modified Files:
	svc_acct.cgi 
Log Message:
re-write RADIUS groups, RT13274

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_acct.cgi,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -w -d -r1.77 -r1.78
--- svc_acct.cgi	27 Jun 2011 18:50:35 -0000	1.77
+++ svc_acct.cgi	29 Jun 2011 03:51:10 -0000	1.78
@@ -308,7 +308,7 @@
 <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 @@
 
 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);
+  @groupnames = map { $_->description . " (" . $_->groupname . ")" } 
+                    qsearch({ 'table'         => 'radius_group',
+                           'extra_sql'     => "where groupnum in (".$part_svc_usergroup->columnvalue.")",
+                        });
 }
 
 my $action = $svcnum ? 'Edit' : 'Add';