diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
| commit | 026dc7ad72ba972f230b6709e31fa64397d75ad4 (patch) | |
| tree | c5af1a7ac9154744afc3660e9a9405892f2bb50b /rt/share/html/Ticket/ModifyLinks.html | |
| parent | 07b4bc84d1078f7390221d766cdb3142513db4b0 (diff) | |
| parent | 1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 (diff) | |
merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237
Diffstat (limited to 'rt/share/html/Ticket/ModifyLinks.html')
| -rwxr-xr-x | rt/share/html/Ticket/ModifyLinks.html | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/rt/share/html/Ticket/ModifyLinks.html b/rt/share/html/Ticket/ModifyLinks.html index eda09c568..59f7141f2 100755 --- a/rt/share/html/Ticket/ModifyLinks.html +++ b/rt/share/html/Ticket/ModifyLinks.html @@ -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> |