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.
bestpractical · Jun 13, 2011 · 67f2bf3 · 67f2bf3
2 parents 0c7607b + 933ae96
commit 67f2bf3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 19 deletions.
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
@@ -2083,19 +2083,19 @@ ticket creation>.
 
 =item on_merge
 
-When tickets are merged status of the ticket that merged is changed by
-force to this. It should be one of inactive statuses; 'resolved' or
-its equivalent is most probably the best candidate.
+When tickets are merged, the status of the ticket that was merged
+away is forced to this value.  It should be one of inactive statuses;
+'resolved' or its equivalent is most probably the best candidate.
 
 =item approved
 
-When an approval accepted status of depending tickets changed
-to this value.
+When an approval is accepted, the status of depending tickets will
+be changed to this value.
 
 =item denied
 
-When an approval denied status of depending tickets changed
-to this value.
+When an approval is denied, the status of depending tickets will
+be changed to this value.
 
 =back
 
@@ -2128,20 +2128,24 @@ above.
 =head3 Protecting status changes with rights
 
 A transition or group of transitions can be protected by a specific
-right.
-
-For example:
+right.  Additionally, you can name new right names, which will be added
+to the system to control that transition.  For example, if you wished to
+create a lesser right than ModifyTicket for rejecting tickets, you could
+write:
 
     default => {
         ...
         rights => {
             '* -> deleted'  => 'DeleteTicket',
             '* -> rejected' => 'RejectTicket',
-            '* -> *'        => 'ModifyTicketStatus',
+            '* -> *'        => 'ModifyTicket',
         },
         ...
     },
 
+This would create a new C<RejectTicket> right in the system which you
+could assign to whatever groups you choose.
+
 On the left hand side you can have the following variants:
 
     '<from> -> <to>'
@@ -2176,7 +2180,6 @@ Use the following format to define labels and actions of transitions:
 
     default => {
         ...
-        actions => {
         actions => [
             'new -> open'     => { label => 'Open it', update => 'Respond' },
             'new -> resolved' => { label => 'Resolve', update => 'Comment' },
@@ -2254,7 +2257,6 @@ Set(%Lifecycles,
         },
         rights => {
             '* -> deleted'  => 'DeleteTicket',
-            '* -> rejected' => 'ModifyTicket',
             '* -> *'        => 'ModifyTicket',
         },
         actions => [

diff --git a/etc/upgrade/4.0.1/content b/etc/upgrade/4.0.1/content
@@ -60,6 +60,24 @@
                 $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 );
+            }
+        }
+    },
 );
 
diff --git a/lib/RT/Lifecycle.pm b/lib/RT/Lifecycle.pm
@@ -484,7 +484,7 @@ sub RightsDescription {
         }
         my $description = 'Change status'
             . ( (grep $_ eq '*', @from)? '' : ' from '. join ', ', @from )
-            . ( (grep $_ eq '*', @to  )? '' : ' to '. join ', ', @from );
+            . ( (grep $_ eq '*', @to  )? '' : ' to '. join ', ', @to );
 
         $res{ $right } = $description;
     }

diff --git a/lib/RT/Queue.pm b/lib/RT/Queue.pm
@@ -114,9 +114,7 @@ our $RIGHTS = {
     CommentOnTicket     => 'Comment on tickets',                                        # loc_pair
     OwnTicket           => 'Own tickets',                                               # loc_pair
     ModifyTicket        => 'Modify tickets',                                            # loc_pair
-    ModifyTicketStatus  => 'Modify ticket status',                                      # loc_pair
     DeleteTicket        => 'Delete tickets',                                            # loc_pair
-    RejectTicket        => 'Reject tickets',                                            # loc_pair
     TakeTicket          => 'Take tickets',                                              # loc_pair
     StealTicket         => 'Steal tickets',                                             # loc_pair
 
@@ -146,9 +144,7 @@ our $RIGHT_CATEGORIES = {
     CommentOnTicket     => 'General',
     OwnTicket           => 'Staff',
     ModifyTicket        => 'Staff',
-    ModifyTicketStatus  => 'Staff',
     DeleteTicket        => 'Staff',
-    RejectTicket        => 'Staff',
     TakeTicket          => 'Staff',
     StealTicket         => 'Staff',
     ForwardMessage      => 'Staff',