[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.4-10-g1d1d736

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  1d1d736881ecaac291e7d200d3fc5e5cf2157653 (commit)
       via  bcae600ae0a004035d6d6c11cd8f7323ab7d5709 (commit)
      from  a6cb25df513a77248787f1c1ae1f931020bfa489 (commit)

Summary of changes:
 share/html/Elements/ShowCustomFields | 11 +++++++----
 share/html/Ticket/ModifyAll.html     |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit bcae600ae0a004035d6d6c11cd8f7323ab7d5709
Author: Matt Zagrabelny <mzagrabe at d.umn.edu>
Date:   Thu Mar 6 16:25:21 2014 -0600

    Add Table parameter to callbacks of ShowCustomFields
    
    Since this component gets rendered differently based on the value of the
    argument $Table, it would be nice to give the same info to the
    callbacks.

diff --git a/share/html/Elements/ShowCustomFields b/share/html/Elements/ShowCustomFields
index f25a362..3bd4b14 100644
--- a/share/html/Elements/ShowCustomFields
+++ b/share/html/Elements/ShowCustomFields
@@ -46,7 +46,7 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % $m->callback( CallbackName => 'BeforeCustomFields', Object => $Object,
-%               Grouping => $Grouping, ARGSRef => \%ARGS, CustomFields => $CustomFields );
+%               Grouping => $Grouping, ARGSRef => \%ARGS, CustomFields => $CustomFields, Table => $Table );
 % if ($Table) {
 <table>
 % }
@@ -70,20 +70,22 @@
 </ul>
 % }
     </td>
-% $m->callback( CallbackName => 'AfterCustomFieldValue', CustomField => $CustomField, Object => $Object, Grouping => $Grouping );
+% $m->callback( CallbackName => 'AfterCustomFieldValue', CustomField => $CustomField,
+%               Object => $Object, Grouping => $Grouping, Table => $Table );
   </tr>
 % }
 % if ($Table) {
 </table>
 % }
 % $m->callback( CallbackName => 'AfterCustomFields', Object => $Object,
-%               Grouping => $Grouping, ARGSRef => \%ARGS );
+%               Grouping => $Grouping, ARGSRef => \%ARGS, Table => $Table );
 <%INIT>
 $m->callback(
     %ARGS,
     CallbackName => 'MassageCustomFields',
-    Object => $Object,
+    Object       => $Object,
     CustomFields => $CustomFields,
+    Table        => $Table,
 );
 
 $CustomFields->LimitToGrouping( $Object => $Grouping ) if defined $Grouping;
@@ -105,6 +107,7 @@ my $print_value = sub {
         Name         => \$comp,
         CustomField  => $cf,
         Object       => $Object,
+        Table        => $Table,
     );
     if ( $m->comp_exists( $comp ) ) {
         $m->comp( $comp, Object => $value );

commit 1d1d736881ecaac291e7d200d3fc5e5cf2157653
Author: Matt Zagrabelny <mzagrabe at d.umn.edu>
Date:   Thu Mar 6 15:17:30 2014 -0600

    add BeforeMessageBox to ModifyAll.html for consistency
    
    Both Ticket/Create.html and Ticket/Update.html have a callback before
    their respective message boxes. ModifyAll.html should as well.

diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index 0cfb5a3..f64613e 100644
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -120,6 +120,7 @@
   <tr>
     <td class="labeltop"><&|/l&>Content</&>:</td>
     <td class="entry">
+% $m->callback( %ARGS, CallbackName => 'BeforeMessageBox' );
 % if (defined $ARGS{UpdateContent} && length($ARGS{UpdateContent})) {
     <& /Elements/MessageBox, Name=>"UpdateContent", Default=>$ARGS{UpdateContent}, IncludeSignature => 0 &>
 % } else {

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