[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 817b5b87447dc24ca004ee8ca014c4a4d527c741

[Mark Wells]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  817b5b87447dc24ca004ee8ca014c4a4d527c741 (commit)
       via  a2d6022f3d7f402c14ce3c2f1983875f86e96027 (commit)
      from  ed8a2367e78d208891e63d7e624e6bdc44ea318f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 817b5b87447dc24ca004ee8ca014c4a4d527c741
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Dec 12 16:20:13 2012 -0800

    fix warning

diff --git a/FS/FS/part_export/sqlradius.pm b/FS/FS/part_export/sqlradius.pm
index 7213966..979d4fb 100644
--- a/FS/FS/part_export/sqlradius.pm
+++ b/FS/FS/part_export/sqlradius.pm
@@ -212,6 +212,7 @@ sub _export_replace {
           return $error;
         }
       }
+      $jobnum = $err_or_queue->jobnum; # chain all of these dependencies
     }
 
     my @del = grep { !exists $new{$_} } keys %old;
@@ -229,6 +230,7 @@ sub _export_replace {
           return $error;
         }
       }
+      $jobnum = $err_or_queue->jobnum; # chain all of these dependencies
     }
   }
 
@@ -347,7 +349,7 @@ sub _export_delete {
 
 sub sqlradius_queue {
   my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my %args = @_;
+  #my %args = @_;
   my $queue = new FS::queue {
     'svcnum' => $svcnum,
     'job'    => "FS::part_export::sqlradius::sqlradius_$method",
@@ -560,6 +562,7 @@ sub sqlreplace_usergroups {
       my $error = $err_or_queue->depend_insert( $jobnum );
       return $error if $error;
     }
+    $jobnum = $err_or_queue->jobnum; # chain all of these dependencies
   }
 
   if ( @newgroups ) {

commit a2d6022f3d7f402c14ce3c2f1983875f86e96027
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Dec 12 16:20:12 2012 -0800

    fix svcpart changes when usergroup is a fixed field, #20458

diff --git a/FS/FS/svc_Radius_Mixin.pm b/FS/FS/svc_Radius_Mixin.pm
index ac97eab..544c7e9 100644
--- a/FS/FS/svc_Radius_Mixin.pm
+++ b/FS/FS/svc_Radius_Mixin.pm
@@ -68,7 +68,8 @@ sub replace  {
 
   $old->usergroup; # make sure this is cached for exports
 
-  my $error =  $new->process_m2m(
+  my $error =  $new->check # make sure fixed fields are set before process_m2m
+            || $new->process_m2m(
                                  'link_table'   => 'radius_usergroup',
                                  'target_table' => 'radius_group',
                                  'params'       => $new->usergroup,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_export/sqlradius.pm |    5 ++++-
 FS/FS/svc_Radius_Mixin.pm      |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)