[freeside-commits] freeside/rt/lib/RT/Action SetWillResolve.pm, 1.1, 1.2

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/rt/lib/RT/Action
In directory wavetail.420.am:/tmp/cvs-serv1614/rt/lib/RT/Action

Modified Files:
	SetWillResolve.pm 
Log Message:
future ticket resolve fixes, #13583

Index: SetWillResolve.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/lib/RT/Action/SetWillResolve.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- SetWillResolve.pm	23 Aug 2011 21:45:50 -0000	1.1
+++ SetWillResolve.pm	7 Sep 2011 23:43:24 -0000	1.2
@@ -9,17 +9,25 @@
 }
 
 sub Prepare  {
-    return 1;
-}
-
-sub Commit {
     my $self = shift;
     my $DateObj = RT::Date->new( $self->CurrentUser );
+    if ( length($self->Argument) ) {
     $DateObj->Set(
       Format => 'unknown', 
-      Value  => $self->Argument,
-    );
-    $self->TicketObj->SetWillResolve( $DateObj->ISO );
+            Value  => $self->Argument
+        )
+    }
+    else { # special case: treat Argument => '' as "never"
+        $DateObj->Unix(-1);
+    }
+    $self->{new_value} = $DateObj->ISO;
+    # if the before and after values are string-equivalent, don't bother
+    return ($DateObj->AsString ne $self->TicketObj->WillResolveAsString);
+}
+
+sub Commit {
+    my $self = shift;
+    $self->TicketObj->SetWillResolve( $self->{new_value} );
 }
 
 RT::Base->_ImportOverlays();