[Rt-commit] r18109 - rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule

[clkao at bestpractical.com]

Author: clkao
Date: Fri Jan 30 07:32:50 2009
New Revision: 18109

Modified:
   rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/Passed.pm
   rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/Rejected.pm

Log:
make most approval test pass.

Modified: rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/Passed.pm
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/Passed.pm	(original)
+++ rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/Passed.pm	Fri Jan 30 07:32:50 2009
@@ -66,7 +66,7 @@
     my $t = $self->ticket_obj->transactions;
 
     while ( my $o = $t->next ) {
-        next unless $o->type eq 'Correspond';
+        next unless $o->type eq 'correspond';
         $note .= $o->content . "\n" if $o->content_obj;
     }
     my ($top) = $self->ticket_obj->all_depended_on_by( Type => 'ticket' );

Modified: rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/Rejected.pm
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/Rejected.pm	(original)
+++ rt/3.999/branches/merge_to_3.8.2/lib/RT/Approval/Rule/Rejected.pm	Fri Jan 30 07:32:50 2009
@@ -77,9 +77,9 @@
         );
     }
     my $links = $self->ticket_obj->depended_on_by;
-    foreach my $link ( @{ $links->items_array_ref } ) {
+    foreach my $link ( @$links ) {
         my $obj = $link->base_obj;
-        if ( $obj->queue->is_active_status( $obj->status ) ) {
+        unless ( $obj->queue->status_schema->is_inactive( $obj->status ) ) {
             if ( $obj->type eq 'approval' ) {
                 $obj->set_status(
                     status => 'deleted',
@@ -90,9 +90,9 @@
     }
 
     $links = $self->ticket_obj->depends_on;
-    foreach my $link ( @{ $links->items_array_ref } ) {
+    foreach my $link ( @$links ) {
         my $obj = $link->target_obj;
-        if ( $obj->queue->is_active_status( $obj->status ) ) {
+        unless ( $obj->queue->status_schema->is_inactive( $obj->status ) ) {
             $obj->set_status(
                 status => 'deleted',
                 force  => 1,