X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Faccess_right.pm;h=815c6d9bdd91fdb238e2b0d8113bb2ce5cc02f44;hb=d9fd5e2d14e21482069db1ab3f97f547f6534cec;hp=d2a39aac862d1a1f10f11af9640108263c54c36c;hpb=3de7385d0a6ad25fa300f50929473f33998ea858;p=freeside.git

diff --git a/FS/FS/access_right.pm b/FS/FS/access_right.pm
index d2a39aac8..815c6d9bd 100644
--- a/FS/FS/access_right.pm
+++ b/FS/FS/access_right.pm
@@ -182,23 +182,39 @@ sub _upgrade_data { # class method
 
   my @all_groups = qsearch('access_group', {});
 
-  ### ACL_list_all_customers
-  if ( !FS::upgrade_journal->is_done('ACL_list_all_customers') ) {
+  my %onetime = (
+    'List customers' => 'List all customers',
+    'List packages'  => 'Summarize packages',
+  );
 
-    # grant "List all customers" to all users who have "List customers"
-    for my $group (@all_groups) {
-      if ( $group->access_right('List customers') ) {
-        my $access_right = FS::access_right->new( {
-            'righttype'   => 'FS::access_group',
-            'rightobjnum' => $group->groupnum,
-            'rightname'   => 'List all customers',
-        } );
-        my $error = $access_right->insert;
-        die $error if $error;
+  foreach my $old_acl ( keys %onetime ) {
+
+    my @new_acl = ref($onetime{$old_acl})
+                    ? @{ $onetime{$old_acl} }
+                    :  ( $onetime{$old_acl} );
+
+    foreach my $new_acl ( @new_acl ) {
+
+      ( my $journal = 'ACL_'.lc($new_acl) ) =~ s/ /_/g;
+      next if FS::upgrade_journal->is_done($journal);
+
+      # grant $new_acl to all groups who have $old_acl
+      for my $group (@all_groups) {
+        if ( $group->access_right($old_acl) ) {
+          my $access_right = FS::access_right->new( {
+              'righttype'   => 'FS::access_group',
+              'rightobjnum' => $group->groupnum,
+              'rightname'   => $new_acl,
+          } );
+          my $error = $access_right->insert;
+          die $error if $error;
+        }
       }
-    }
     
-    FS::upgrade_journal->set_done('ACL_list_all_customers');
+      FS::upgrade_journal->set_done($journal);
+
+    }
+
   }
 
   ### ACL_download_report_data