[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 141c6ddb6daccb5546e35ba98131a30c4a64ee1d

[Mark Wells]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  141c6ddb6daccb5546e35ba98131a30c4a64ee1d (commit)
      from  8898d63f1a0be81775ecef61094d62129ea6ff38 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 141c6ddb6daccb5546e35ba98131a30c4a64ee1d
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Apr 27 14:25:58 2012 -0700

    fix some warnings in ticket escalation, #17417

diff --git a/rt/lib/RT/Action/Accumulate.pm b/rt/lib/RT/Action/Accumulate.pm
index c4ca667..14675b8 100644
--- a/rt/lib/RT/Action/Accumulate.pm
+++ b/rt/lib/RT/Action/Accumulate.pm
@@ -23,7 +23,8 @@ the same name, and should be single-valued fields.
 sub Prepare {
     my $self = shift;
     my $cfname = $self->Argument or return 0;
-    $self->{'inc_by'} = $self->TransactionObj->FirstCustomFieldValue($cfname);
+    $self->{'inc_by'} = $self->TransactionObj->FirstCustomFieldValue($cfname) 
+                        || '';
     return ( $self->{'inc_by'} =~ /^(\d+)$/ );
 }
 
diff --git a/rt/lib/RT/Action/EscalateQueue.pm b/rt/lib/RT/Action/EscalateQueue.pm
index adafbdf..2775a83 100755
--- a/rt/lib/RT/Action/EscalateQueue.pm
+++ b/rt/lib/RT/Action/EscalateQueue.pm
@@ -116,15 +116,18 @@ sub Commit {
     if ( my $due_in = $new_queue->DefaultDueIn ) {
         $Due->SetToNow;
         $Due->AddDays( $due_in );
-    }
-    ( $val, $msg ) = $ticket->_Set(
-      Field => 'Due',
-      Value => $Due->ISO,
-      RecordTransaction => 0,
-    );
-    if (! $val) {
-        $RT::Logger->error( "Couldn't set new due date: $msg" );
-        return (0, $msg);
+        
+        if ( $Due->ISO ne $ticket->Due ) {
+            ( $val, $msg ) = $ticket->_Set(
+              Field => 'Due',
+              Value => $Due->ISO,
+              RecordTransaction => 0,
+            );
+            if (! $val) {
+                $RT::Logger->error( "Couldn't set new due date: $msg" );
+                return (0, $msg);
+            }
+        }
     }
     return 1;
 }

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

Summary of changes:
 rt/lib/RT/Action/Accumulate.pm    |    3 ++-
 rt/lib/RT/Action/EscalateQueue.pm |   21 ++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)