[Rt-commit] r4895 - in rtir/branches/1.9-EXPERIMENTAL: lib/RT/Action

[ruz at bestpractical.com]

Author: ruz
Date: Wed Mar 29 18:20:07 2006
New Revision: 4895

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueBySLA.pm
   rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueCorrespond.pm
   rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueIncident.pm
   rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueReopen.pm

Log:
 r1134 at cubic-pc:  cubic | 2006-03-30 02:53:41 +0400
 * minor changes


Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueBySLA.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueBySLA.pm	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueBySLA.pm	Wed Mar 29 18:20:07 2006
@@ -81,8 +81,8 @@
     # now that we know the SLA, set the value of the CF
     unless ( $self->TicketObj->FirstCustomFieldValue('_RTIR_SLA') ) {
         my $cf = RT::CustomField->new( $self->CurrentUser );
-        $cf->LoadByNameAndQueue( Queue => $self->TicketObj->QueueObj->Id, Name => '_RTIR_SLA' );
-        return unless $cf->Id;
+        $cf->LoadByNameAndQueue( Queue => $self->TicketObj->Queue, Name => '_RTIR_SLA' );
+        return unless $cf->id;
 
         my $SLAObj = RT::IR::SLAInit();
         my $sla = $SLAObj->SLA( $time );

Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueCorrespond.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueCorrespond.pm	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueCorrespond.pm	Wed Mar 29 18:20:07 2006
@@ -77,17 +77,15 @@
 
     my $bizhours = RT::IR::BusinessHours();
 
-    my $date = RT::Date->new($RT::SystemUser);
+    my $date = RT::Date->new( $RT::SystemUser );
     $date->SetToNow;
+    $date->AddDays( RT->Config->Get('OverdueAfter') || 7 );
 
-    $date->AddDays(RT->Config->Get('OverdueAfter'));
-
-    my $due = $bizhours->first_after($date->Unix);
-    $date->Set(Format => 'unix', Value => $due);
-    $self->TicketObj->SetDue($date->ISO);
+    my $due = $bizhours->first_after( $date->Unix );
+    $date->Set( Format => 'unix', Value => $due );
+    $self->TicketObj->SetDue( $date->ISO );
 
     return 1;
-
 }
 
 # }}}

Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueIncident.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueIncident.pm	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueIncident.pm	Wed Mar 29 18:20:07 2006
@@ -81,8 +81,8 @@
         $uri->FromURI( $self->TransactionObj->OldValue );
         return $self->UpdateDue( $uri->Object );
     }
-    
-    my $incidents = new RT::Tickets($self->CurrentUser);
+
+    my $incidents = new RT::Tickets( $self->CurrentUser );
     $incidents->FromSQL( "Queue = 'Incidents' AND HasMember = " . $self->TicketObj->id );
     while ( my $incident = $incidents->Next ) {
         $self->UpdateDue( $incident );

Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueReopen.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueReopen.pm	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_SetDueReopen.pm	Wed Mar 29 18:20:07 2006
@@ -75,13 +75,12 @@
     # create a new SLA object
     my $SLAObj = RT::IR::SLAInit();
 
-    # set the Business::Hours
-    my $bh = RT::IR::BusinessHours();
-
     # Set the defaults from the RTIR_Config.pm file
     $SLAObj->SetInHoursDefault( RT->Config->Get('SLA_Reopen_InHours') );
     $SLAObj->SetOutOfHoursDefault( RT->Config->Get('SLA_Reopen_OutOfHours') );
 
+    # set the Business::Hours
+    my $bh = RT::IR::BusinessHours();
     $SLAObj->SetBusinessHours( $bh );
 
     # get the due date