diff options
| author | Mark Wells <mark@freeside.biz> | 2013-08-07 16:39:21 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2013-08-07 16:39:21 -0700 |
| commit | f3a97201def678ff5cb382520132f303a16d0d12 (patch) | |
| tree | 42aaacfe990d6fef1933a8c2e5536880311d6b85 | |
| parent | 2d54c6f57754b233f5ba7f19b34a26285ebab08e (diff) | |
fix WillResolve date editing in ticket basics, #23309
| -rw-r--r-- | rt/lib/RT/Interface/Web.pm | 1 | ||||
| -rw-r--r-- | rt/lib/RT/Interface/Web_Vendor.pm | 12 | ||||
| -rwxr-xr-x | rt/share/html/Ticket/Elements/EditBasics | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/rt/lib/RT/Interface/Web.pm b/rt/lib/RT/Interface/Web.pm index bdad21350..4a6bfda88 100644 --- a/rt/lib/RT/Interface/Web.pm +++ b/rt/lib/RT/Interface/Web.pm @@ -2983,6 +2983,7 @@ sub ProcessTicketDates { Starts Started Due + WillResolve ); #Run through each field in this list. update the value if apropriate diff --git a/rt/lib/RT/Interface/Web_Vendor.pm b/rt/lib/RT/Interface/Web_Vendor.pm index fb2b80717..a5f5b8827 100644 --- a/rt/lib/RT/Interface/Web_Vendor.pm +++ b/rt/lib/RT/Interface/Web_Vendor.pm @@ -254,8 +254,20 @@ sub ProcessTicketBasics { TimeLeft Type Queue + WillResolve ); + # 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; + if ( $ARGSRef->{'Queue'} and ( $ARGSRef->{'Queue'} !~ /^(\d+)$/ ) ) { my $tempqueue = RT::Queue->new($RT::SystemUser); $tempqueue->Load( $ARGSRef->{'Queue'} ); diff --git a/rt/share/html/Ticket/Elements/EditBasics b/rt/share/html/Ticket/Elements/EditBasics index ae70bd802..a86bb6c52 100755 --- a/rt/share/html/Ticket/Elements/EditBasics +++ b/rt/share/html/Ticket/Elements/EditBasics @@ -52,6 +52,7 @@ $InTable => 0 %defaults => () </%ARGS> <%INIT> +my $WillResolveObj = $TicketObj->WillResolveObj; unless ( @fields ) { @fields = ( { name => 'Subject', @@ -72,7 +73,9 @@ unless ( @fields ) { comp => '/Elements/SelectDate', args => { menu_prefix => 'WillResolve', - Default => $ARGS{'WillResolve'} || $TicketObj->WillResolveObj->Date, + Default => $ARGS{'WillResolve'} || + ($WillResolveObj->Unix > 0 ? + $WillResolveObj->Date : ''), current => 0, ShowTime => 0, }, |