[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.1-353-gecd0708

[Shawn Moore]

The branch, 4.4-trunk has been updated
       via  ecd07082d28053b3cbe578070b4c1b6a6d358573 (commit)
       via  811c1f2b62d7e99bb333861249c9109220c90a02 (commit)
      from  c16979682ed2e76f221e7ce32ec357451f4b5cbb (commit)

Summary of changes:
 share/html/Elements/ShowTransaction | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 811c1f2b62d7e99bb333861249c9109220c90a02
Author: Matt Zagrabelny <mzagrabe at d.umn.edu>
Date:   Fri May 26 13:49:35 2017 -0500

    add CreatorObj reference to ShowTransaction Default callback
    
    Use a lexical scope variable for CreatorObj and expose it to default
    callback via a reference argument.
    
    This allows admins to modify the Creator that gets displayed for the
    transaction.

diff --git a/share/html/Elements/ShowTransaction b/share/html/Elements/ShowTransaction
index f7bdaa5..bae9156 100644
--- a/share/html/Elements/ShowTransaction
+++ b/share/html/Elements/ShowTransaction
@@ -57,7 +57,7 @@
 % $m->callback( %ARGS, Transaction => $Transaction, CallbackName => 'AfterAnchor' );
     <span class="date"><% $date |n %></span>
     <span class="description">
-      <& /Elements/ShowUser, User => $Transaction->CreatorObj &> - <% $desc |n %>
+      <& /Elements/ShowUser, User => $CreatorObj &> - <% $desc |n %>
 % $m->callback( %ARGS, Transaction => $Transaction, CallbackName => 'AfterDescription' );
     </span>
 % if ( $Object->isa("RT::Ticket") and $Object->CurrentUserCanSeeTime ) {
@@ -227,6 +227,8 @@ elsif ( %$Attachments && $ShowActions ) {
     }
 }
 
+my $CreatorObj = $Transaction->CreatorObj;
+
 $m->callback(
     %ARGS,
     Transaction => $Transaction,
@@ -238,6 +240,7 @@ $m->callback(
     TimeTaken   => \$time,
     Description => \$desc,
     ShowBody    => \$ShowBody,
+    CreatorObj  => \$CreatorObj,
 );
 
 my $actions = '';

commit ecd07082d28053b3cbe578070b4c1b6a6d358573
Merge: c169796 811c1f2b
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri May 26 15:12:36 2017 -0400

    Merge branch '4.4/add-creator-reference-argument-to-show-transaction-callback' into 4.4-trunk


-----------------------------------------------------------------------