[Rt-commit] r4693 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR/Elements lib/RT/Action

[ruz at bestpractical.com]

Author: ruz
Date: Sat Mar  4 21:31:08 2006
New Revision: 4693

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/States
   rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetIncidentReportState.pm
   rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetInvestigationState.pm
   rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetState.pm

Log:
 r847 at cubic-pc:  cubic | 2006-03-05 05:35:32 +0300
 * cleanup states according to initial data


Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/States
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/States	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/States	Sat Mar  4 21:31:08 2006
@@ -1,8 +1,8 @@
 <%ONCE>
 my %meta = (
-    'Incidents'        => { Active => ['new', 'open', 'stalled'], Inactive => [] },
-    'Incident Reports' => { Active => ['new', 'open'], Inactive => ['rejected', 'resolved'] },
-    'Investigations'   => { Active => ['new', 'open'], Inactive => ['stalled'] },
+    'Incidents'        => { Active => ['open'], Inactive => ['resolved', 'abandoned'] },
+    'Incident Reports' => { Active => ['new', 'open'], Inactive => ['resolved', 'rejected'] },
+    'Investigations'   => { Active => ['open'], Inactive => ['resolved'] },
     'Blocks'           => {
         Active => ['pending activation', 'active', 'pending removal'],
         Inactive => ['removed'],

Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetIncidentReportState.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetIncidentReportState.pm	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetIncidentReportState.pm	Sat Mar  4 21:31:08 2006
@@ -63,15 +63,15 @@
     if ( $status =~ /^(?:new|open|stalled)$/ ) {
         $state = 'new';
 
-        my $parents = RT::Tickets->new($self->TransactionObj->CurrentUser);
-        $parents->LimitHasMember($self->TicketObj->id);
-        $parents->LimitQueue(VALUE => 'Incidents');
-        if ($parents->Count) {
+        my $parents = RT::Tickets->new( $self->TransactionObj->CurrentUser );
+        $parents->LimitHasMember( $self->TicketObj->id );
+        $parents->LimitQueue( VALUE => 'Incidents' );
+        if ( $parents->Count ) {
             $state = 'open';
         }
-    } elsif ($status eq 'resolved') {
+    } elsif ( $status eq 'resolved' ) {
         $state = 'resolved';
-    } elsif ($status eq 'rejected') {
+    } elsif ( $status eq 'rejected' ) {
         $state = 'rejected';
     }
     return $state || '';

Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetInvestigationState.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetInvestigationState.pm	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetInvestigationState.pm	Sat Mar  4 21:31:08 2006
@@ -58,9 +58,11 @@
 sub GetState {
     my $self = shift;
     my %state = (
-        open => 'new',
-        new  => 'new',
+        new      => 'open',
+        open     => 'open',
+        stalled  => 'open',
         resolved => 'resolved',
+        rejected => 'resolved',
     );
     return $state{ $self->TicketObj->Status } || '';
 }

Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetState.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetState.pm	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetState.pm	Sat Mar  4 21:31:08 2006
@@ -22,8 +22,8 @@
 
     my $t = $self->TicketObj;
 
-    my $cf = RT::CustomField->new($self->TransactionObj->CurrentUser);
-    $cf->LoadByNameAndQueue(Queue => $t->QueueObj->Id, Name => '_RTIR_State');
+    my $cf = RT::CustomField->new( $self->TransactionObj->CurrentUser );
+    $cf->LoadByNameAndQueue( Queue => $t->QueueObj->Id, Name => '_RTIR_State' );
     return 1 unless $cf->Id;
 
     my $state = $self->GetState;