X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FTicket%2FElements%2FShowTransaction;h=a9c751fff76ad69cd4da9ff845c37a3f487441aa;hb=b8988e1d3ac75af63c85e8563e57701030315a9e;hp=e76e004957f9bea08c2da5e2fc1561c6efa82a62;hpb=24548f7cf666bac02335d0bc74f81251c7b4ab50;p=freeside.git diff --git a/rt/share/html/Ticket/Elements/ShowTransaction b/rt/share/html/Ticket/Elements/ShowTransaction index e76e00495..a9c751fff 100755 --- a/rt/share/html/Ticket/Elements/ShowTransaction +++ b/rt/share/html/Ticket/Elements/ShowTransaction @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -47,37 +47,33 @@ %# END BPS TAGGED BLOCK }}}
% $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $Transaction, %ARGS, CallbackName => 'ModifyDisplay' ); -
% $m->callback( titlebar_cmd => \$titlebar_commands, Transaction => $Transaction, %ARGS, CallbackName => 'ModifyCommand' ); -
-% if ( $Transaction->CustomFieldValues->Count ) { +% if ( $type_class eq 'message' ) { <& /Elements/ShowCustomFields, Object => $Transaction &> % } % $m->comp('ShowTransactionAttachments', %ARGS, Parent => 0) unless ($Collapsed ||!$ShowBody);
-
- <%ARGS> $Ticket => undef $Transaction => undef @@ -100,7 +96,6 @@ $WarnUnsigned => undef <%ONCE> my %class = ( - Create => 'message', Correspond => 'message', Comment => 'message', @@ -124,6 +119,9 @@ $transdate =~ s/\s/ /g; my ($type, $field) = ($Transaction->Type, $Transaction->Field || ''); my $type_class = $class{ $type }; +if ( $type eq 'Create' && $Transaction->ObjectType eq 'RT::Ticket' ) { + $type_class = 'message'; +} unless ( $type_class ) { if ( $field eq 'Owner' ) { @@ -194,28 +192,35 @@ else { my $can_modify = $ticket->CurrentUserHasRight('ModifyTicket'); if ( $can_modify || $ticket->CurrentUserHasRight('ReplyToTicket') ) { $titlebar_commands .= - "[" + . "&Action=Respond\" " + . "class=\"reply-link\"" + . ">" . loc('Reply') . "] "; } if ( $can_modify || $ticket->CurrentUserHasRight('CommentOnTicket') ) { $titlebar_commands .= - "[Ticket - . "&QuoteTransaction=" - . $Transaction->Id - . "&Action=Comment\">" - . loc('Comment') . "]"; + "[" + . loc('Comment') + . "]"; } if ( $ticket->CurrentUserHasRight('ForwardMessage') ) { $titlebar_commands .= - "[". loc('Forward') . "]"; + "[" + . loc('Forward') + . "]"; } if ( $can_modify && RT->Config->Get('GnuPG')->{'Enable'} @@ -223,9 +228,12 @@ else { && $ticket->CurrentUserHasRight('ForwardMessage') ) { $titlebar_commands .= - "[". loc('Encrypt/Decrypt') . "]"; + "[" + . loc('Encrypt/Decrypt') + . "]"; } } }