[Rt-commit] [rtir] 09/24: Further lifecycles changes

[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 400a94a815e6d481942c84216a51e36af198f38b
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Feb 6 16:34:03 2015 -0800

    Further lifecycles changes
---
 html/RTIR/Incident/Reply/index.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/html/RTIR/Incident/Reply/index.html b/html/RTIR/Incident/Reply/index.html
index cc862e6..4e161ab 100644
--- a/html/RTIR/Incident/Reply/index.html
+++ b/html/RTIR/Incident/Reply/index.html
@@ -70,7 +70,7 @@
 <& /RTIR/Search/Elements/ShowResults,
     Queue         => 'Incident Reports',
     BaseURL       => $BaseURL,
-    BaseQuery     => RT::IR->Query(Queue => 'Incident Reports', MemberOf => $id),
+    BaseQuery     => RT::IR->Query(Lifecycle => 'incident_reports', MemberOf => $id),
     Query         => $Query,
     DisplayFormat => "__CheckBox.{SelectedReports}__, $Format",
     Format        => $Format,
@@ -84,7 +84,7 @@
 <& /RTIR/Search/Elements/ShowResults,
     Queue         => 'Investigations',
     BaseURL       => $BaseURL,
-    BaseQuery     => RT::IR->Query(Queue => 'Investigations', MemberOf => $id),
+    BaseQuery     => RT::IR->Query(Lifecycle => 'investigations', MemberOf => $id),
     Query         => $Query,
     DisplayFormat => "__CheckBox.{SelectedInvestigations}__, $Format",
     Format        => $Format,
@@ -96,9 +96,9 @@
 % unless( RT->Config->Get('RTIR_DisableBlocksQueue') ) {
 <h2><&|/l&>Blocks Correspondents</&></h2>
 <& /RTIR/Search/Elements/ShowResults,
-    Queue         => 'Investigations',
+    Queue         => 'Investigations', # XXX TODO Shouldn't this be Blocks?
     BaseURL       => $BaseURL,
-    BaseQuery     => RT::IR->Query(Queue => 'Blocks', MemberOf => $id),
+    BaseQuery     => RT::IR->Query(Lifecycle => 'blocks', MemberOf => $id),
     Query         => $Query,
     DisplayFormat => "__CheckBox.{SelectedBlocks}__, $Format",
     Format        => $Format,
@@ -243,11 +243,11 @@ if ($Status eq 'resolved') {
     }
 }
 
-my @queues = ('Incident Reports');
-push @queues, 'Investigations' if $All;
-push @queues, 'Blocks' unless RT->Config->Get('RTIR_DisableBlocksQueue');
+my @lifecycles = ('incident_reports');
+push @lifecycles, 'investigations' if $All;
+push @lifecycles, 'blocks' unless RT->Config->Get('RTIR_DisableBlocksQueue');
 
-$Query ||= RT::IR->ActiveQuery( Queue => \@queues );
+$Query ||= RT::IR->ActiveQuery( Lifecycle => \@lifecycles );
 
 my $BaseURL = "RTIR/Incident/Reply/?".
     $m->comp('/Elements/QueryString',
@@ -257,7 +257,7 @@ my $BaseURL = "RTIR/Incident/Reply/?".
         Action => $Action,
     );
 
-my $candidates = RT::IR->IncidentChildren( $IncidentObj, Queue => \@queues )->Count;
+my $candidates = RT::IR->IncidentChildren( $IncidentObj, Lifecycle => \@lifecycles )->Count;
 
 </%INIT>
 

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