From 9ce482da3960ee43decee41fba53b78c12c3e52c Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 24 Sep 2016 10:28:06 -0700
Subject: rt 4.2.13 ticket#13852

---
 rt/share/html/Elements/CollectionAsTable/Header      |  2 +-
 rt/share/html/Elements/CollectionAsTable/ParseFormat |  2 +-
 rt/share/html/Elements/CollectionAsTable/Row         | 17 +++++++++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'rt/share/html/Elements/CollectionAsTable')

diff --git a/rt/share/html/Elements/CollectionAsTable/Header b/rt/share/html/Elements/CollectionAsTable/Header
index a1c5c482e..341113b2a 100644
--- a/rt/share/html/Elements/CollectionAsTable/Header
+++ b/rt/share/html/Elements/CollectionAsTable/Header
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
diff --git a/rt/share/html/Elements/CollectionAsTable/ParseFormat b/rt/share/html/Elements/CollectionAsTable/ParseFormat
index aeeec6d0f..a4ceeaea5 100644
--- a/rt/share/html/Elements/CollectionAsTable/ParseFormat
+++ b/rt/share/html/Elements/CollectionAsTable/ParseFormat
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
diff --git a/rt/share/html/Elements/CollectionAsTable/Row b/rt/share/html/Elements/CollectionAsTable/Row
index 4b2cfae43..7a37657b6 100644
--- a/rt/share/html/Elements/CollectionAsTable/Row
+++ b/rt/share/html/Elements/CollectionAsTable/Row
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -82,7 +82,6 @@ foreach my $column (@Format) {
     }
 
     my $class = $column->{class} ? $m->interp->apply_escapes($column->{class}, 'h') : 'collection-as-table';
-    $m->out(qq{<td class="$class" });
 
     my %attrs;
     foreach my $attr (qw(style align)) {
@@ -136,6 +135,20 @@ foreach my $column (@Format) {
         );
     }
 
+    $m->callback(
+        CallbackName => 'EachField',
+        Record       => $record,
+        Format       => \@Format,
+        Column       => $column,
+        Classes      => \$class,
+        Align        => \$attrs{align},
+        Style        => \$attrs{style},
+        Colspan      => \$attrs{colspan},
+        Out          => \@out,
+    );
+
+    $m->out(qq{<td class="$class" });
+
     $m->out( $_ .'="'. $m->interp->apply_escapes( $attrs{$_} => 'h' ) .'"' )
         foreach grep $attrs{$_}, qw(align style colspan);
 
-- 
cgit v1.2.1