[freeside-commits] branch master updated. ec34946605aefd8455b4d7a8bd197d8eabe7ce3c

[Mark Wells]

The branch, master has been updated
       via  ec34946605aefd8455b4d7a8bd197d8eabe7ce3c (commit)
      from  900cd00529c581517808138764c6b9ae08d703cd (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 ec34946605aefd8455b4d7a8bd197d8eabe7ce3c
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Aug 13 14:06:55 2013 -0700

    fix WillResolve date fallout from #23309

diff --git a/rt/lib/RT/Interface/Web_Vendor.pm b/rt/lib/RT/Interface/Web_Vendor.pm
index 7a4804b..023dede 100644
--- a/rt/lib/RT/Interface/Web_Vendor.pm
+++ b/rt/lib/RT/Interface/Web_Vendor.pm
@@ -257,17 +257,18 @@ 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);
+      } else {
+          $DateObj->Set(Value => 0);
+      }
+      $ARGSRef->{'WillResolve'} = $DateObj->ISO;
+    }
 
     if ( $ARGSRef->{'Queue'} and ( $ARGSRef->{'Queue'} !~ /^(\d+)$/ ) ) {
         my $tempqueue = RT::Queue->new($RT::SystemUser);

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

Summary of changes:
 rt/lib/RT/Interface/Web_Vendor.pm |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)