X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FTicket%2FElements%2FShowTransaction;h=2c217b4388bac2af4c8f1bc9de80c6b058e4d0f1;hb=679854b8bbc65d112071111bbd7f34a6a481fb30;hp=a533323a9a027d247eac80d1856ba5a45fc0a7fd;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd;p=freeside.git diff --git a/rt/share/html/Ticket/Elements/ShowTransaction b/rt/share/html/Ticket/Elements/ShowTransaction index a533323a9..2c217b438 100755 --- a/rt/share/html/Ticket/Elements/ShowTransaction +++ b/rt/share/html/Ticket/Elements/ShowTransaction @@ -1,40 +1,40 @@ %# BEGIN BPS TAGGED BLOCK {{{ -%# +%# %# COPYRIGHT: -%# -%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC -%# -%# +%# +%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC +%# +%# %# (Except where explicitly superseded by other copyright notices) -%# -%# +%# +%# %# LICENSE: -%# +%# %# This work is made available to you under the terms of Version 2 of %# the GNU General Public License. A copy of that license should have %# been provided with this software, but in any event can be snarfed %# from www.gnu.org. -%# +%# %# This work is distributed in the hope that it will be useful, but %# WITHOUT ANY WARRANTY; without even the implied warranty of %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %# General Public License for more details. -%# +%# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software %# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA %# 02110-1301 or visit their web page on the internet at %# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. -%# -%# +%# +%# %# CONTRIBUTION SUBMISSION POLICY: -%# +%# %# (The following paragraph is not intended to limit the rights granted %# to you to modify and distribute this software under the terms of %# the GNU General Public License and is only of importance to you if %# you choose to contribute your changes and enhancements to the %# community by submitting them to Best Practical Solutions, LLC.) -%# +%# %# By intentionally submitting any modifications, corrections or %# derivatives to this work, or any other work intended for use with %# Request Tracker, to Best Practical Solutions, LLC, you confirm that @@ -43,39 +43,37 @@ %# royalty-free, perpetual, license to use, copy, create derivative %# works based on those contributions, and sublicense and distribute %# those contributions and any derivatives thereof. -%# +%# %# 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 @@ -98,7 +96,6 @@ $WarnUnsigned => undef <%ONCE> my %class = ( - Create => 'message', Correspond => 'message', Comment => 'message', @@ -122,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' ) { @@ -140,6 +140,13 @@ unless ( $type_class ) { } } +$m->callback( + CallbackName => 'MassageTypeClass', + Transaction => $Transaction, + TypeClassRef => \$type_class, + ARGSRef => \%ARGS, +); + my $TicketString = ''; if ( $Ticket->Id != $Transaction->Ticket ) { $TicketString = loc("Ticket #[_1]:", $Transaction->Ticket) .' '; @@ -156,6 +163,13 @@ unless ($Attachments) { } my $titlebar_commands = ''; +$m->callback( + CallbackName => 'MassageAttachments', + Transaction => $Transaction, + AttachmentsRef => \$Attachments, + ARGSRef => \%ARGS, +); + if ( $type =~ /EmailRecord$/ ) { $titlebar_commands .= @@ -178,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'} @@ -207,9 +228,12 @@ else { && $ticket->CurrentUserHasRight('ForwardMessage') ) { $titlebar_commands .= - "[". loc('Encrypt/Decrypt') . "]"; + "[" + . loc('Encrypt/Decrypt') + . "]"; } } }