X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fradius_group.pm;h=21ce25f37d2b4d4f5eba32241e77891dd55df81b;hp=8adf9231beb47d2a392410126d225eba7ece51f4;hb=3adb46fccf9f631e188ea5383bd147b340477639;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924

diff --git a/FS/FS/radius_group.pm b/FS/FS/radius_group.pm
index 8adf9231b..21ce25f37 100644
--- a/FS/FS/radius_group.pm
+++ b/FS/FS/radius_group.pm
@@ -1,8 +1,8 @@
 package FS::radius_group;
+use base qw( FS::o2m_Common FS::Record );
 
 use strict;
-use base qw( FS::o2m_Common FS::Record );
-use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( qsearch dbh );
 use FS::radius_attr;
 
 =head1 NAME
@@ -47,6 +47,8 @@ description
 
 priority - for export
 
+=item speed_up, speed_down - connection speeds in bits per second.  Some 
+exports may use this to generate appropriate RADIUS attributes.
 
 =back
 
@@ -82,9 +84,59 @@ Delete this record from the database.
 
 =cut
 
-# I'd delete any linked attributes here but we don't really support group
-# deletion.  We would also have to delete linked records from 
-# radius_usergroup and part_svc_column...
+sub delete {
+  # okay, I guess we support it now
+  my $self = shift;
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $groupnum = $self->groupnum;
+  my $error = $self->process_o2m(
+                'table' => 'radius_usergroup',
+                'num_col' => 'groupnum',
+                'fields' => ['groupnum'], # just delete them
+                'params' => {},
+              ) || $self->SUPER::delete(@_);
+
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  foreach my $part_svc_column (
+    qsearch('part_svc_column', { columnname => 'usergroup' }) 
+  ) {
+    my $new_values = join(',', 
+      grep { $_ != $groupnum } split(',', $part_svc_column->columnvalue)
+    );
+    next if $new_values eq $part_svc_column->columnvalue;
+    $part_svc_column->set(columnvalue => $new_values);
+    $error = $part_svc_column->replace;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  foreach my $radius_attr ( $self->radius_attr ) {
+    $error = $radius_attr->delete;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+  }
+
+  dbh->commit;
+  '';
+}
 
 =item replace OLD_RECORD
 
@@ -135,6 +187,8 @@ sub check {
     || $self->ut_text('groupname')
     || $self->ut_textn('description')
     || $self->ut_numbern('priority')
+    || $self->ut_numbern('speed_up')
+    || $self->ut_numbern('speed_down')
   ;
   return $error if $error;