From 24548f7cf666bac02335d0bc74f81251c7b4ab50 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 21 Jan 2012 03:46:24 +0000
Subject: import rt 3.8.11

---
 rt/share/html/Ticket/Elements/PreviewScrips   |  8 ++++----
 rt/share/html/Ticket/Elements/ShowTransaction | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'rt/share/html/Ticket')

diff --git a/rt/share/html/Ticket/Elements/PreviewScrips b/rt/share/html/Ticket/Elements/PreviewScrips
index a7576e5ad..dcf85a558 100755
--- a/rt/share/html/Ticket/Elements/PreviewScrips
+++ b/rt/share/html/Ticket/Elements/PreviewScrips
@@ -65,7 +65,7 @@ my @non_recipients = @{ $squelch{'EmailAddresses'} };
 <b><% $scrip->Description || loc('Scrip #[_1]',$scrip->id) %></b><br />
 <&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name)&>[_1] [_2] with template [_3]</&>
 <br />
-%foreach my $type qw(To Cc Bcc) {
+%foreach my $type (qw(To Cc Bcc)) {
 %my @addresses =  $scrip->ActionObj->Action->$type();
 <ul>
 %foreach my $addr (@addresses) {
@@ -90,7 +90,7 @@ my @non_recipients = @{ $squelch{'EmailAddresses'} };
 %    next unless $rule->{hints} && $rule->{hints}{class} eq 'SendEmail';
 <b><% $rule->Describe %></b>
 %    my $data = $rule->{hints}{recipients};
-%    foreach my $type qw(To Cc Bcc) {
+%    foreach my $type (qw(To Cc Bcc)) {
 <ul>
 %        foreach my $address (@{$data->{$type}}) {
 <li>
@@ -205,7 +205,7 @@ foreach my $scrip ( @{ $txn->Scrips->Prepared } ) {
     my $action = $scrip->ActionObj->Action;
     next unless $action->isa('RT::Action::SendEmail');
 
-    foreach my $type qw(To Cc Bcc) {
+    foreach my $type (qw(To Cc Bcc)) {
         push @recipients, $action->$type();
     }
 }
@@ -250,7 +250,7 @@ foreach my $scrip ( @{ $txn->Scrips->Prepared } ) {
     my $action = $scrip->ActionObj->Action;
     next unless $action->isa('RT::Action::SendEmail');
 
-    foreach my $type qw(To Cc Bcc) {
+    foreach my $type (qw(To Cc Bcc)) {
         push @recipients, $action->$type();
     }
 }
diff --git a/rt/share/html/Ticket/Elements/ShowTransaction b/rt/share/html/Ticket/Elements/ShowTransaction
index 14c4d2aba..e76e00495 100755
--- a/rt/share/html/Ticket/Elements/ShowTransaction
+++ b/rt/share/html/Ticket/Elements/ShowTransaction
@@ -142,6 +142,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) .' ';
@@ -158,6 +165,13 @@ unless ($Attachments) {
 }
 my $titlebar_commands = '';
 
+$m->callback(
+    CallbackName   => 'MassageAttachments',
+    Transaction    => $Transaction,
+    AttachmentsRef => \$Attachments,
+    ARGSRef        => \%ARGS,
+);
+
 if ( $type =~ /EmailRecord$/ ) {
 
     $titlebar_commands .=
-- 
cgit v1.2.1