From: ivan <ivan>
Date: Wed, 19 Jun 2002 00:58:57 +0000 (+0000)
Subject: fix problem provisioning RADIUS groups
X-Git-Tag: freeside_1_4_0_beta1~86
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=ef6202c5eded27360d058c84cb8cb2b5cf69478f

fix problem provisioning RADIUS groups
  caused by kristian/mark/pc-intouch's changes moving exports into svc_Common -
  changed sequence of events such that groups were not provisioned when the
  sqlradius export was run
---

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 9186e8107..0be6e5b8d 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -931,8 +931,14 @@ Returns all RADIUS groups for this account (see L<FS::radius_usergroup>).
 
 sub radius_groups {
   my $self = shift;
-  map { $_->groupname }
-    qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } );
+  if ( $self->usergroup ) {
+    #when provisioning records, export callback runs in svc_Common.pm before
+    #radius_usergroup records can be inserted...
+    @{$self->usergroup};
+  } else {
+    map { $_->groupname }
+      qsearch('radius_usergroup', { 'svcnum' => $self->svcnum } );
+  }
 }
 
 =back