Merge branch '6.0/lifecycle-status-rights' into 6.0-trunk

Author: sunnavy

lib/RT/Lifecycle.pm

@@ -458,7 +458,7 @@ sub CheckRight {
     return $to eq 'deleted' ? 'DeleteTicket' : 'ModifyTicket';
 }
 
-=head3 RightsDescription [TYPE]
+=head3 RightsDescription [TYPE] [LIFECYCLE]
 
 Returns hash with description of rights that are defined for
 particular transitions.
@@ -468,11 +468,17 @@ particular transitions.
 sub RightsDescription {
     my $self = shift;
     my $type = shift;
+    my $lifecycle_name = shift;
 
     $self->FillCache unless keys %LIFECYCLES_CACHE;
 
+    if ( $lifecycle_name && !exists $LIFECYCLES_CACHE{$lifecycle_name} ) {
+        RT->Logger->warning("Lifecycle '$lifecycle_name' not found in LIFECYCLES_CACHE, ignoring");
+        undef $lifecycle_name;
+    }
+
     my %tmp;
-    foreach my $lifecycle ( values %LIFECYCLES_CACHE ) {
+    foreach my $lifecycle ( $lifecycle_name ? $LIFECYCLES_CACHE{$lifecycle_name} : values %LIFECYCLES_CACHE ) {
         next unless exists $lifecycle->{'rights'};
         next if $type and $lifecycle->{type} ne $type;
         while ( my ($transition, $right) = each %{ $lifecycle->{'rights'} } ) {

lib/RT/Record/Role/Rights.pm

@@ -108,8 +108,13 @@ sub AvailableRights {
     my $class = ref($self) || $self;
 
     my %rights;
-    $rights{$_->{Name}} = $_->{Description}
-        for values %{$RT::ACE::RIGHTS{$class} || {} };
+    if ( blessed $self && $self->DOES('RT::Record::Role::Lifecycle') ) {
+        %rights = RT::Lifecycle->RightsDescription( $self->LifecycleType, $self->Lifecycle );
+    }
+
+    $rights{ $_->{Name} } = $_->{Description}
+        for grep { $_->{Category} ne 'Status' } values %{ $RT::ACE::RIGHTS{$class} || {} };
+
     return \%rights;
 }
 

t/web/lifecycle_rights.t

@@ -83,4 +83,24 @@ diag 'Test status rights cleanup';
     $agent->text_lacks('StallTicket', 'Deleted right is gone on Rights page');
 }
 
+diag 'Test that queue rights page only shows rights for its lifecycle';
+{
+    # General queue uses 'default' lifecycle which has no custom status rights
+    # The 'triage' lifecycle defines 'EscalateTicket' right
+    # That right should NOT appear on General queue's rights page
+
+    $agent->get_ok('/Admin/Queues/GroupRights.html?id=1');
+    $agent->text_lacks( 'EscalateTicket', 'Rights from other lifecycles should not appear on queue rights page' );
+
+    # Now test a queue using the 'triage' lifecycle DOES show EscalateTicket
+    my $triage_queue = RT::Test->load_or_create_queue(
+        Name      => 'triage',
+        Lifecycle => 'triage',
+    );
+    ok $triage_queue && $triage_queue->id, 'loaded or created triage queue';
+
+    $agent->get_ok('/Admin/Queues/GroupRights.html?id=' . $triage_queue->id);
+    $agent->text_contains( 'EscalateTicket', 'Rights from queue lifecycle should appear on queue rights page' );
+}
+
 done_testing;