[Rt-commit] rt branch, 4.0.1-releng, updated. rt-4.0.1rc1-53-g67f2bf3

[Shawn Moore]

The branch, 4.0.1-releng has been updated
       via  67f2bf3b0dabee710aaa23bdd36c2deee9011599 (commit)
       via  933ae96019c0a44d9e97a85dbef072742028df5c (commit)
       via  396bd2fcbdf9958436ce7dfddfbd356145dc0710 (commit)
       via  a8f4312afe83027456d17778ddfd91db860d2a9a (commit)
       via  6edaaae72705e29a0812132d1b398f033f7c6cc0 (commit)
       via  1af3c867110e2bd824a0f20ef0085bd0da5a8286 (commit)
       via  658472da2cc6611c9f5d389d6caaea73c9766a7d (commit)
       via  680d9ee660a083e0a0216e75cec4c2e972bb7d4a (commit)
       via  ceaf7d710761bed721b94c0958938d948fb25e2b (commit)
      from  0c7607b6b773b4c7e15a59e2a727615f0a297f9b (commit)

Summary of changes:
 etc/RT_Config.pm.in       |   28 +++++++++++++++-------------
 etc/upgrade/4.0.1/content |   20 +++++++++++++++++++-
 lib/RT/Lifecycle.pm       |    2 +-
 lib/RT/Queue.pm           |    4 ----
 4 files changed, 35 insertions(+), 19 deletions(-)

- Log -----------------------------------------------------------------
commit 67f2bf3b0dabee710aaa23bdd36c2deee9011599
Merge: 0c7607b 933ae96
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Mon Jun 13 14:31:32 2011 -0400

    Merge branch '4.0/clean-lifecycle-rights' into 4.0.1-releng
    
    Conflicts:
    	etc/upgrade/4.0.1/content
        4.0.1 had grown a "remove personal group and delegation rights" upgrade
        step, which was duplicated in this branch for removing unused lifecycle
        rights, so the conflict is mostly spurious.

diff --cc etc/upgrade/4.0.1/content
index 86bf9e8,f6baf12..9b74ff1
--- a/etc/upgrade/4.0.1/content
+++ b/etc/upgrade/4.0.1/content
@@@ -45,21 -45,21 +45,39 @@@
      },
      sub {
          use strict;
 +        $RT::Logger->debug('Removing all Delegate and PersonalGroup rights');
 +
 +        my $acl = RT::ACL->new(RT->SystemUser);
 +        for my $right (qw/AdminOwnPersonalGroups AdminAllPersonalGroups DelegateRights/) {
 +            $acl->Limit( FIELD => 'RightName', VALUE => $right );
 +        }
 +
 +        while ( my $ace = $acl->Next ) {
 +            my ( $ok, $msg ) = $ace->Delete();
 +            $RT::Logger->debug("Removing ACE ".$ace->id." for right ".$ace->__Value('RightName'));
 +
 +            if ( !$ok ) {
 +                $RT::Logger->warn( "Unable to delete ACE " . $ace->id . ": " . $msg );
 +            }
 +        }
-     }
++    },
++    sub {
++        use strict;
+         $RT::Logger->debug('Removing unimplemented RejectTicket and ModifyTicketStatus rights');
+ 
+         my $acl = RT::ACL->new(RT->SystemUser);
+         for my $right (qw/RejectTicket ModifyTicketStatus/) {
+             $acl->Limit( FIELD => 'RightName', VALUE => $right );
+         }
+ 
+         while ( my $ace = $acl->Next ) {
+             my ( $ok, $msg ) = $ace->Delete();
+             $RT::Logger->debug("Removing ACE ".$ace->id." for right ".$ace->__Value('RightName'));
+ 
+             if ( !$ok ) {
+                 $RT::Logger->warn( "Unable to delete ACE " . $ace->id . ": " . $msg );
+             }
+         }
+     },
  );
  

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