From f46c9ed67a0d771216210729a24878a75931853d Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Tue, 13 Aug 2013 14:34:43 -0700 Subject: fix WillResolve date fallout from #23309 --- rt/lib/RT/Interface/Web_Vendor.pm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'rt/lib/RT/Interface/Web_Vendor.pm') diff --git a/rt/lib/RT/Interface/Web_Vendor.pm b/rt/lib/RT/Interface/Web_Vendor.pm index 7a4804bf9..023dede8f 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); -- cgit v1.2.1 From 23c8996f73976d52a4380d616ed9276d9640f444 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Sat, 17 Aug 2013 17:06:36 -0700 Subject: fix upgrade bug that was causing tickets to spontaneously resolve, #23309 --- rt/lib/RT/Interface/Web_Vendor.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'rt/lib/RT/Interface/Web_Vendor.pm') diff --git a/rt/lib/RT/Interface/Web_Vendor.pm b/rt/lib/RT/Interface/Web_Vendor.pm index 023dede8f..0c061e2de 100644 --- a/rt/lib/RT/Interface/Web_Vendor.pm +++ b/rt/lib/RT/Interface/Web_Vendor.pm @@ -264,10 +264,11 @@ sub ProcessTicketBasics { my $DateObj = RT::Date->new($session{'CurrentUser'}); if ( $to_date ) { $DateObj->Set(Format => 'unknown', Value => $to_date); - } else { + $ARGSRef->{'WillResolve'} = $DateObj->ISO; + } elsif ( $TicketObj and $TicketObj->WillResolveObj->Unix > 0 ) { $DateObj->Set(Value => 0); + $ARGSRef->{'WillResolve'} = $DateObj->ISO; } - $ARGSRef->{'WillResolve'} = $DateObj->ISO; } if ( $ARGSRef->{'Queue'} and ( $ARGSRef->{'Queue'} !~ /^(\d+)$/ ) ) { -- cgit v1.2.1