diff options
author | Mark Wells <mark@freeside.biz> | 2013-07-31 14:17:46 -0700 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2013-07-31 14:17:46 -0700 |
commit | 42447f6eacba455dcd54403e69f96e78dbe6f01b (patch) | |
tree | 4202ea03f04636f821e29b181c485ed7ebf2e768 /rt/share/html/Ticket | |
parent | af12e29224dd69ef1d577c5e9943644feafe5525 (diff) |
add RT WillResolve date to ticket search and Edit Basics, #23309
Diffstat (limited to 'rt/share/html/Ticket')
-rwxr-xr-x | rt/share/html/Ticket/Elements/EditBasics | 27 | ||||
-rwxr-xr-x | rt/share/html/Ticket/Modify.html | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/rt/share/html/Ticket/Elements/EditBasics b/rt/share/html/Ticket/Elements/EditBasics index 0d4159f81..ae70bd802 100755 --- a/rt/share/html/Ticket/Elements/EditBasics +++ b/rt/share/html/Ticket/Elements/EditBasics @@ -65,6 +65,16 @@ unless ( @fields ) { Default => $defaults{'Status'} || undef, TicketObj => $TicketObj, QueueObj => $TicketObj->QueueObj, + onchange => 'changeStatus()', + }, + }, + { name => 'Resolve this Ticket on', + comp => '/Elements/SelectDate', + args => { + menu_prefix => 'WillResolve', + Default => $ARGS{'WillResolve'} || $TicketObj->WillResolveObj->Date, + current => 0, + ShowTime => 0, }, }, { name => 'Queue', @@ -141,4 +151,19 @@ for my $field (@fields) { % unless ($InTable) { </table> % } - +<script type="text/javascript"> +function changeStatus() { + var Status_select = document.getElementById('Status'); + var x = Status_select.options[Status_select.selectedIndex].value; + var text = document.getElementById('WillResolve_Date'); + var button = document.getElementById('WillResolve_Date_date_button'); + if (x == 'resolved' || x == 'rejected' || x == 'deleted') { + text.disabled = true; + button.style.display = 'none'; + } + else { + text.disabled = false; + button.style.display = 'inline'; + } +} +</script> diff --git a/rt/share/html/Ticket/Modify.html b/rt/share/html/Ticket/Modify.html index 146384e2e..4b24b89a9 100755 --- a/rt/share/html/Ticket/Modify.html +++ b/rt/share/html/Ticket/Modify.html @@ -82,6 +82,8 @@ my @results; push @results, ProcessTicketBasics(TicketObj => $TicketObj, ARGSRef => \%ARGS); push @results, ProcessObjectCustomFieldUpdates(Object => $TicketObj, ARGSRef => \%ARGS); push @results, ProcessTicketStatus(TicketObj => $TicketObj, ARGSRef => \%ARGS); +# for WillResolve +push @results, ProcessTicketDates( TicketObj => $TicketObj, ARGSRef => \%ARGS); $TicketObj->ApplyTransactionBatch; |