Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH

1 files changed, 13 insertions, 11 deletions

diff --git a/rt/lib/RT/Interface/Web_Vendor.pm b/rt/lib/RT/Interface/Web_Vendor.pm
index 7a4804bf9..0c061e2de 100644
--- a/rt/lib/RT/Interface/Web_Vendor.pm
+++ b/rt/lib/RT/Interface/Web_Vendor.pm
@@ -257,17 +257,19 @@ sub ProcessTicketBasics {
         WillResolve
     );
 
-# causes endless redirect loops and "WillResolve changed from Not set to Not set" on ticket view?
-#    # the UI for editing WillResolve through Ticket Basics should allow 
-#    # setting it to null
-#    my $to_date = delete($ARGSRef->{'WillResolve_Date'});
-#    my $DateObj = RT::Date->new($session{'CurrentUser'});
-#    if ( $to_date ) {
-#        $DateObj->Set(Format => 'unknown', Value => $to_date);
-#    } else {
-#        $DateObj->Set(Value => 0);
-#    }
-#    $ARGSRef->{'WillResolve'} = $DateObj->ISO;
+    # the UI for editing WillResolve through Ticket Basics should allow 
+    # setting it to null
+    if ( exists $ARGSRef->{'WillResolve_Date'} ) {
+      my $to_date = delete($ARGSRef->{'WillResolve_Date'});
+      my $DateObj = RT::Date->new($session{'CurrentUser'});
+      if ( $to_date ) {
+          $DateObj->Set(Format => 'unknown', Value => $to_date);
+          $ARGSRef->{'WillResolve'} = $DateObj->ISO;
+      } elsif ( $TicketObj and $TicketObj->WillResolveObj->Unix > 0 ) {
+          $DateObj->Set(Value => 0);
+          $ARGSRef->{'WillResolve'} = $DateObj->ISO;
+      }
+    }
 
     if ( $ARGSRef->{'Queue'} and ( $ARGSRef->{'Queue'} !~ /^(\d+)$/ ) ) {
         my $tempqueue = RT::Queue->new($RT::SystemUser);