Merge branch 'master' of https://github.com/jgoodman/Freeside

[freeside.git] / FS / FS / access_right.pm

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index 85334ed..d26db48 100644 (file)
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -5,6 +5,7 @@ use vars qw( @ISA );
 use Tie::IxHash;
 use FS::Record qw( qsearch qsearchs );
 use FS::upgrade_journal;
+use FS::access_group;
 
 @ISA = qw(FS::Record);
 
@@ -187,7 +188,8 @@ sub _upgrade_data { # class method
 
   my @all_groups = qsearch('access_group', {});
 
-  tie my %onetime, 'Tie::IxHash',
+  #tie my %onetime, 'Tie::IxHash',
+  my @onetime = (
     'List customers'                      => 'List all customers',
     'List all customers'                  => 'Advanced customer search',
     'List packages'                       => 'Summarize packages',
@@ -224,6 +226,8 @@ sub _upgrade_data { # class method
     'Services: Hardware' => 'Services: Hardware: Advanced search',
     'Services: Phone numbers' => 'Services: Phone numbers: Advanced search',
 
+    'Services: Accounts' => 'Services: Alarm services',
+
     'List rating data' => [ 'Usage: RADIUS sessions',
                             'Usage: Call Detail Records (CDRs)',
                             'Usage: Unrateable CDRs',
@@ -236,13 +240,23 @@ sub _upgrade_data { # class method
     'Services: Accounts' => 'Services: Cable Subscribers',
     'Bulk change customer packages' => 'Bulk move customer services',
     'Configuration' => 'Edit sales people',
-;
+    'Configuration' => 'Alarm global configuration',
+    'Services: Accounts' => 'Services: Conferencing',
+    'Services: Accounts' => 'Services: Video',
+    'Edit global package definitions' => 'Edit package definition costs',
+    'Add on-the-fly credit reason' => 'Add on-the-fly refund reason',
+  );
+
+#  foreach my $old_acl ( keys %onetime ) {
+#
+#    my @new_acl = ref($onetime{$old_acl})
+#                    ? @{ $onetime{$old_acl} }
+#                    :  ( $onetime{$old_acl} );
 
-  foreach my $old_acl ( keys %onetime ) {
+  while ( @onetime ) {
 
-    my @new_acl = ref($onetime{$old_acl})
-                    ? @{ $onetime{$old_acl} }
-                    :  ( $onetime{$old_acl} );
+    my( $old_acl, $new_acl ) = splice(@onetime, 0, 2);
+    my @new_acl = ref($new_acl) ? @$new_acl : ( $new_acl );
 
     foreach my $new_acl ( @new_acl ) {