[Rt-commit] [svn] r1570 - in rtir/branches/1.1-TESTING: etc lib/RT

[leira at pallas.eruditorum.org]

Author: leira
Date: Mon Sep 27 22:18:16 2004
New Revision: 1570

Modified:
   rtir/branches/1.1-TESTING/etc/RTIR_Config.pm
   rtir/branches/1.1-TESTING/lib/RT/IR.pm
Log:
Change format of SLA configuration.

Support both old and new SLA configuration styles.

Add example for an SLA of 60 real minutes (not business minutes).


Modified: rtir/branches/1.1-TESTING/etc/RTIR_Config.pm
==============================================================================
--- rtir/branches/1.1-TESTING/etc/RTIR_Config.pm	(original)
+++ rtir/branches/1.1-TESTING/etc/RTIR_Config.pm	Mon Sep 27 22:18:16 2004
@@ -18,9 +18,20 @@
 
 # Set the number of minutes for the SLA
 
-Set($SLA, {'Full service' => 60, 
-	   'Full service: out of hours' => 120, 
-	   'Reduced service' => 120});
+Set($SLA, {'Full service' => { BusinessMinutes => 60, 
+			       RealMinutes => 0,
+			   },
+	   'Full service: out of hours' =>  { BusinessMinutes => 120, 
+					      RealMinutes => 0,
+					  },
+	   'Reduced service' =>  { BusinessMinutes => 120, 
+				   RealMinutes => 0,
+			       },
+#	   '60 Real Minutes' =>  { BusinessMinutes => undef, 
+#				   RealMinutes => 60,
+#			       },
+       }
+    );
 
 
 # Set the defaults for RTIR custom fields

Modified: rtir/branches/1.1-TESTING/lib/RT/IR.pm
==============================================================================
--- rtir/branches/1.1-TESTING/lib/RT/IR.pm	(original)
+++ rtir/branches/1.1-TESTING/lib/RT/IR.pm	Mon Sep 27 22:18:16 2004
@@ -82,7 +82,11 @@
     $SLAObj->SetBusinessHours($bh);
 
     foreach my $key (keys %$RT::SLA) {
-	$SLAObj->Add($key, ( BusinessMinutes =>  $RT::SLA->{$key} ));
+	if ($RT::SLA->{$key} =~ /^\d+$/) {
+	    $SLAObj->Add($key, ( BusinessMinutes =>  $RT::SLA->{$key} ));
+	} else {
+	    $SLAObj->Add($key, %{$RT::SLA->{$key}} );
+	}
     }
 
     return $SLAObj;