[Rt-commit] [rtir] 03/24: Progressively replacing queue-based searches

[Jesse Vincent]

This is an automated email from the git hooks/post-receive script.

jesse pushed a commit to branch 3.4/remove_old_constituencies
in repository rtir.

commit 6bf7a15637ac7cf492bcc98ecbaed8dd5819ac53
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Feb 6 14:05:36 2015 -0800

    Progressively replacing queue-based searches
    
    This commit makes additional changes to searches to
    use the new lifecycle-based search infrastructure
---
 html/Callbacks/RTIR/Elements/Tabs/Privileged | 10 +++++-----
 lib/RT/Action/RTIR_ChangeChildOwnership.pm   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/html/Callbacks/RTIR/Elements/Tabs/Privileged b/html/Callbacks/RTIR/Elements/Tabs/Privileged
index b240c2c..0a355da 100644
--- a/html/Callbacks/RTIR/Elements/Tabs/Privileged
+++ b/html/Callbacks/RTIR/Elements/Tabs/Privileged
@@ -89,21 +89,21 @@ if ( $has_query ) {
 
 $root->child(
     incidents => title => loc('Incidents'),
-    path => '/RTIR/Search/Results.html?Queue=Incidents'
+    path => '/RTIR/Search/Results.html?Lifecycle=incidents'
 )->child(
     create => title => loc('Create'),
     path => '/RTIR/Create.html?Queue=Incidents',
 );
 $root->child(
     reports => title => loc('Incident Reports'),
-    path => '/RTIR/Search/Results.html?Queue=Incident%20Reports'
+    path => '/RTIR/Search/Results.html?Lifecycle=incident_reports'
 )->child(
     create => title => loc('Create'),
     path => '/RTIR/Create.html?Queue=Incident%20Reports',
 );
 $root->child(
     investigations => title => loc('Investigations'),
-    path => '/RTIR/Search/Results.html?Queue=Investigations'
+    path => '/RTIR/Search/Results.html?Lifecycle=investigations'
 )->child(
     launch => title => loc('Launch'),
     path => '/RTIR/Create.html?Queue=Investigations',
@@ -111,7 +111,7 @@ $root->child(
 unless ( RT->Config->Get('RTIR_DisableBlocksQueue') ) {
     $root->child(
         blocks => title => loc('Blocks'),
-        path => '/RTIR/Search/Results.html?Queue=Blocks'
+        path => '/RTIR/Search/Results.html?Lifecycle=blocks'
     )->child(
         create => title => loc('Create'),
         path => '/RTIR/Create.html?Queue=Blocks',
@@ -364,7 +364,7 @@ if ( $request_path =~ m{^/RTIR/(?:$re_rtir_types/)?(Display|Edit|Update|Forward|
     );
     PageMenu()->child(
         edit_search => title => loc('Edit Search'),
-        path => "/RTIR/Merge/Refine.html?". $query_string->( %args, Queue => $ticket->Queue ),
+        path => "/RTIR/Merge/Refine.html?". $query_string->( %args, Lifecycle => $ticket->QueueObj->Lifecycle ),
     );
     PageMenu()->child(
         back => title => loc('Back to ticket #[_1]', $id),
diff --git a/lib/RT/Action/RTIR_ChangeChildOwnership.pm b/lib/RT/Action/RTIR_ChangeChildOwnership.pm
index 448731a..819c33e 100644
--- a/lib/RT/Action/RTIR_ChangeChildOwnership.pm
+++ b/lib/RT/Action/RTIR_ChangeChildOwnership.pm
@@ -73,9 +73,9 @@ sub Commit {
     }
 
     # change owner of child Incident Reports, Investigations, Blocks
-    my $query =  "(Queue = 'Incident Reports'"
-                ." OR Queue = 'Investigations'"
-                ." OR Queue = 'Blocks'"
+    my $query =  "(Lifecycle = 'incident_reports'"
+                ." OR Lifecycle = 'investigations'"
+                ." OR Lifecycle = 'blocks'"
                 .") AND MemberOf = ". $self->TicketObj->Id
                 ." AND Owner != ". $transaction->NewValue;
     my $members = RT::Tickets->new( $actor );

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.