X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FTicket%2FElements%2FEditTransactionCustomFields;h=2d88796e0a130361fcc011e2824eb5f5b679879d;hb=de9d037528895f7151a9aead6724ce2df95f9586;hp=e9a1bbb5ca88b2d5e1812a50cdd9bf158c4ae0ce;hpb=85e677b86fc37c54e6de2b06340351a28f5a5916;p=freeside.git

diff --git a/rt/share/html/Ticket/Elements/EditTransactionCustomFields b/rt/share/html/Ticket/Elements/EditTransactionCustomFields
index e9a1bbb5c..2d88796e0 100644
--- a/rt/share/html/Ticket/Elements/EditTransactionCustomFields
+++ b/rt/share/html/Ticket/Elements/EditTransactionCustomFields
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -45,7 +45,7 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-% $m->callback( CallbackName => 'BeforeTransactionCustomFields', TicketObj => $TicketObj, QueueObj => $QueueObj, NamePrefix => $NamePrefix );
+% $m->callback( CallbackName => 'BeforeTransactionCustomFields', TicketObj => $TicketObj, QueueObj => $QueueObj, InTable => $InTable );
 % if ( $WRAP ) {
 <<% $WRAP %> class="edit-transaction-custom-fields">
 % }
@@ -56,15 +56,16 @@
 % next unless $CF->UILocation eq $UILocation;
 <<% $FIELD %>>
 <<% $CELL %> class="label cflabel">
-  <span class="name"><% loc($CF->Name) %>:</span><br />
+  <span class="name"><% $CF->Name %>:</span><br />
 % if ( $CF->Type ne 'TimeValue' ) {
   <span class="type"><% $CF->FriendlyType %></span>
 % }
 </<% $CELL %>>
 <<% $CELL %>>
 <& /Elements/EditCustomField,
+    %ARGS,
     CustomField => $CF,
-    NamePrefix => $NamePrefix
+    Object => RT::Transaction->new( $session{'CurrentUser'} ),
 &>
 %  if (my $msg = $m->notes('InvalidField-' . $CF->Id)) {
         <br />
@@ -77,7 +78,7 @@
 % if ( $WRAP ) {
 </<% $WRAP %>>
 % }
-% $m->callback( CallbackName => 'AfterTransactionCustomFields', TicketObj => $TicketObj, QueueObj => $QueueObj, NamePrefix => $NamePrefix );
+% $m->callback( CallbackName => 'AfterTransactionCustomFields', TicketObj => $TicketObj, QueueObj => $QueueObj, InTable => $InTable );
 
 <%INIT>
 my $CustomFields;
@@ -88,7 +89,7 @@ if ($TicketObj) {
     $CustomFields = $QueueObj->TicketTransactionCustomFields();
 }
 
-$m->callback( CallbackName => 'MassageTransactionCustomFields', CustomFields => $CustomFields );
+$m->callback( CallbackName => 'MassageTransactionCustomFields', CustomFields => $CustomFields, InTable => $InTable );
 
 $AsTable ||= $InTable;
 my $FIELD = $AsTable ? 'tr' : 'div';
@@ -102,7 +103,6 @@ if ( $AsTable ) {
 
 </%INIT>
 <%ARGS>
-$NamePrefix => "Object-RT::Transaction--CustomField-"
 $TicketObj => undef
 $QueueObj => undef
 $AsTable => 0