diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-08-11 16:18:24 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-08-11 16:18:24 -0700 |
| commit | 35e5b12fb55f229edd16bed66e21c5806b8d3b7e (patch) | |
| tree | 4c36e5b3821e92cfe773a4d57a82d9172ecf62aa /rt | |
| parent | 9005d0ad058eee59bacafe26217ed4fda2da1800 (diff) | |
| parent | 98ea745e4b55a38ad8b5ba3749c56327d641d65d (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt')
| -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 | 6 |
3 files changed, 18 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..e7a16620f 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 if defined $TicketObj; unless ( @fields ) { @fields = ( { name => 'Subject', @@ -72,7 +73,10 @@ unless ( @fields ) { comp => '/Elements/SelectDate', args => { menu_prefix => 'WillResolve', - Default => $ARGS{'WillResolve'} || $TicketObj->WillResolveObj->Date, + Default => $ARGS{'WillResolve'} || + (defined($WillResolveObj) + and $WillResolveObj->Unix > 0 ? + $WillResolveObj->Date : ''), current => 0, ShowTime => 0, }, |