[Rt-commit] rt branch, 4.2/active-status, created. rt-4.0.0rc7-249-gc39b16d

[Shawn Moore]

The branch, 4.2/active-status has been created
        at  c39b16d747e2cbdef8b9bad65cff48ed657ca49e (commit)

- Log -----------------------------------------------------------------
commit facf3f03bf82131768b73b93198280edbe41671f
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Apr 5 10:18:41 2011 -0400

    Add Tickets->LimitActiveStatus and LimitInactiveStatus

diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 3b01bdd..1c9a31a 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -2066,7 +2066,43 @@ sub LimitStatus {
     );
 }
 
+=head2 LimitActiveStatus
 
+Limits the status to L<RT::Queue/ActiveStatusArray>
+
+TODO: make this respect lifecycles for the queues associated with the search
+
+=cut
+
+sub LimitActiveStatus {
+    my $self = shift;
+
+    my @active = RT::Queue->ActiveStatusArray();
+    for my $active (@active) {
+        $tickets->LimitStatus(
+            VALUE => $active,
+        );
+    }
+}
+
+=head2 LimitInactiveStatus
+
+Limits the status to L<RT::Queue/InactiveStatusArray>
+
+TODO: make this respect lifecycles for the queues associated with the search
+
+=cut
+
+sub LimitInactiveStatus {
+    my $self = shift;
+
+    my @active = RT::Queue->InactiveStatusArray();
+    for my $active (@active) {
+        $tickets->LimitStatus(
+            VALUE => $active,
+        );
+    }
+}
 
 =head2 IgnoreType
 

commit 001192c5af020dfad536e99aadcc4ad2291511cf
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Apr 5 10:21:05 2011 -0400

    Use LimitActiveStatus in place of its definition

diff --git a/lib/RT/Record.pm b/lib/RT/Record.pm
index bd3e6b5..f07fa7d 100644
--- a/lib/RT/Record.pm
+++ b/lib/RT/Record.pm
@@ -1080,10 +1080,7 @@ sub UnresolvedDependencies {
     my $self = shift;
     my $deps = RT::Tickets->new($self->CurrentUser);
 
-    my @live_statuses = RT::Queue->ActiveStatusArray();
-    foreach my $status (@live_statuses) {
-        $deps->LimitStatus(VALUE => $status);
-    }
+    $deps->LimitActiveStatus;
     $deps->LimitDependedOnBy($self->Id);
 
     return($deps);
diff --git a/lib/RT/Search/ActiveTicketsInQueue.pm b/lib/RT/Search/ActiveTicketsInQueue.pm
index ed2c0fa..94659f9 100644
--- a/lib/RT/Search/ActiveTicketsInQueue.pm
+++ b/lib/RT/Search/ActiveTicketsInQueue.pm
@@ -78,10 +78,7 @@ sub Prepare  {
   my $self = shift;
 
   $self->TicketsObj->LimitQueue(VALUE => $self->Argument);
-
-  foreach my $status (RT::Queue->ActiveStatusArray()) {
-        $self->TicketsObj->LimitStatus(VALUE => $status);
-  }
+  $self->TicketsObj->LimitActiveStatus;
 
   return(1);
 }
diff --git a/share/html/Tools/MyDay.html b/share/html/Tools/MyDay.html
index aa0b21a..28397c1 100644
--- a/share/html/Tools/MyDay.html
+++ b/share/html/Tools/MyDay.html
@@ -106,7 +106,7 @@ foreach my $arg ( keys %ARGS ) {
 
 my $Tickets = RT::Tickets->new($session{'CurrentUser'});
 $Tickets->LimitOwner(VALUE => $session{'CurrentUser'}->Id);
-$Tickets->LimitStatus( VALUE => $_ ) foreach RT::Queue->ActiveStatusArray;
+$Tickets->LimitActiveStatus;
 $Tickets->OrderBy ( FIELD => 'Priority', ORDER => 'DESC');
 
 

commit c39b16d747e2cbdef8b9bad65cff48ed657ca49e
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Apr 5 10:23:58 2011 -0400

    Rename to LimitTo(Inactive|Active)Status for clarity

diff --git a/lib/RT/Record.pm b/lib/RT/Record.pm
index f07fa7d..96bd504 100644
--- a/lib/RT/Record.pm
+++ b/lib/RT/Record.pm
@@ -1080,7 +1080,7 @@ sub UnresolvedDependencies {
     my $self = shift;
     my $deps = RT::Tickets->new($self->CurrentUser);
 
-    $deps->LimitActiveStatus;
+    $deps->LimitToActiveStatus;
     $deps->LimitDependedOnBy($self->Id);
 
     return($deps);
diff --git a/lib/RT/Search/ActiveTicketsInQueue.pm b/lib/RT/Search/ActiveTicketsInQueue.pm
index 94659f9..cd5372b 100644
--- a/lib/RT/Search/ActiveTicketsInQueue.pm
+++ b/lib/RT/Search/ActiveTicketsInQueue.pm
@@ -78,7 +78,7 @@ sub Prepare  {
   my $self = shift;
 
   $self->TicketsObj->LimitQueue(VALUE => $self->Argument);
-  $self->TicketsObj->LimitActiveStatus;
+  $self->TicketsObj->LimitToActiveStatus;
 
   return(1);
 }
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 1c9a31a..ad069b3 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -2066,7 +2066,7 @@ sub LimitStatus {
     );
 }
 
-=head2 LimitActiveStatus
+=head2 LimitToActiveStatus
 
 Limits the status to L<RT::Queue/ActiveStatusArray>
 
@@ -2074,7 +2074,7 @@ TODO: make this respect lifecycles for the queues associated with the search
 
 =cut
 
-sub LimitActiveStatus {
+sub LimitToActiveStatus {
     my $self = shift;
 
     my @active = RT::Queue->ActiveStatusArray();
@@ -2085,7 +2085,7 @@ sub LimitActiveStatus {
     }
 }
 
-=head2 LimitInactiveStatus
+=head2 LimitToInactiveStatus
 
 Limits the status to L<RT::Queue/InactiveStatusArray>
 
@@ -2093,7 +2093,7 @@ TODO: make this respect lifecycles for the queues associated with the search
 
 =cut
 
-sub LimitInactiveStatus {
+sub LimitToInactiveStatus {
     my $self = shift;
 
     my @active = RT::Queue->InactiveStatusArray();
diff --git a/share/html/Tools/MyDay.html b/share/html/Tools/MyDay.html
index 28397c1..c1ac7cf 100644
--- a/share/html/Tools/MyDay.html
+++ b/share/html/Tools/MyDay.html
@@ -106,7 +106,7 @@ foreach my $arg ( keys %ARGS ) {
 
 my $Tickets = RT::Tickets->new($session{'CurrentUser'});
 $Tickets->LimitOwner(VALUE => $session{'CurrentUser'}->Id);
-$Tickets->LimitActiveStatus;
+$Tickets->LimitToActiveStatus;
 $Tickets->OrderBy ( FIELD => 'Priority', ORDER => 'DESC');
 
 

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