From da199f671b3f990c1c81e2806a9a04b1877d9c90 Mon Sep 17 00:00:00 2001 From: levinse Date: Fri, 24 Jun 2011 02:48:44 +0000 Subject: [PATCH 1/1] re-write RADIUS groups, RT13274 --- FS/FS/svc_acct.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm index 9a2f0092b..e8c797afa 100644 --- a/FS/FS/svc_acct.pm +++ b/FS/FS/svc_acct.pm @@ -2563,7 +2563,13 @@ sub radius_groups { 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', -- 2.11.0