diff options
| author | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
| commit | 88bf5db0cca989c51237c661a13078eef08b3674 (patch) | |
| tree | 0a84e1b5e7fd239f57fab678bf40c5311b0064a0 /rt/share/html/Ticket/ModifyLinks.html | |
| parent | 9c15ffe3a5ee987e30e10c6a0ad1b5bf0b2a12e3 (diff) | |
| parent | e7eb845db1afab1cbdbc34ff9c387c5ac554659e (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
Diffstat (limited to 'rt/share/html/Ticket/ModifyLinks.html')
| -rwxr-xr-x | rt/share/html/Ticket/ModifyLinks.html | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/rt/share/html/Ticket/ModifyLinks.html b/rt/share/html/Ticket/ModifyLinks.html index c29d8766f..59f7141f2 100755 --- a/rt/share/html/Ticket/ModifyLinks.html +++ b/rt/share/html/Ticket/ModifyLinks.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -57,23 +57,31 @@ % my (@extra); % push @extra, titleright_raw => '<a href="'. RT->Config->Get('WebPath') . '/Ticket/Graphs/index.html?id='.$Ticket->id.'">'.loc('Graph').'</a>' unless RT->Config->Get('DisableGraphViz'); <&| /Widgets/TitleBox, title => loc('Edit Links'), class=>'ticket-info-links', @extra &> -<& /Elements/EditLinks, Object => $Ticket, Merge => 1 &> +<& /Elements/EditLinks, Object => $Ticket &> </&> -<& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes') &> -</form> +<&| /Widgets/TitleBox, title => loc('Merge'), class=>'ticket-info-merge' &> +<& Elements/EditMerge, Ticket => $Ticket, %ARGS &> +</&> +<& /Elements/Submit, Name => 'SubmitTicket', Label => loc('Save Changes') &> +</form> +% $m->callback(CallbackName => 'AfterForm', ARGSRef => \%ARGS, Ticket => $Ticket); <%INIT> - my $Ticket = LoadTicket($id); my @results; $m->callback( TicketObj => $Ticket, ARGSRef => \%ARGS, Results => \@results ); push @results, ProcessTicketLinks( TicketObj => $Ticket, ARGSRef => \%ARGS ); +push @results, ProcessObjectCustomFieldUpdates( TicketObj => $Ticket, ARGSRef => \%ARGS ); $Ticket->ApplyTransactionBatch; - + +MaybeRedirectForResults( + Actions => \@results, + Arguments => { id => $id }, +); </%INIT> |