[freeside-commits] freeside/FS/FS svc_acct.pm,1.315,1.316

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv28455

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

Index: svc_acct.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_acct.pm,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -w -d -r1.315 -r1.316
--- svc_acct.pm	23 Jun 2011 23:19:26 -0000	1.315
+++ svc_acct.pm	24 Jun 2011 02:48:44 -0000	1.316
@@ -2563,7 +2563,13 @@
       unless ref($self->usergroup) eq 'ARRAY';
     #when provisioning records, export callback runs in svc_Common.pm before
     #radius_usergroup records can be inserted...
-    @{$self->usergroup};
+    my $groups = join(',',@{$self->usergroup});
+    my @groups;
+    return @groups unless length($groups);
+    @groups = qsearch({ 'table'         => 'radius_group',
+                           'extra_sql'     => "where groupnum in ($groups)",
+                        });
+    map { $_->groupname } @groups;
   } else {
      my $format = shift || '';
      my @groups = qsearch({ 'table'         => 'radius_usergroup',