[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.8-121-gb4121d9

? sunnavy sunnavy at bestpractical.com
Mon Aug 2 01:03:47 EDT 2010


The branch, 3.8-trunk has been updated
       via  b4121d9de84ba37a9fb5e14d7c63431f9f483c51 (commit)
       via  67bd88f80dc2959f0e6d1c675e4eed0d407431aa (commit)
      from  073bb2363b865665732656ec054c5e516b2c1965 (commit)

Summary of changes:
 share/html/Elements/CollectionAsTable/Header |    4 ++++
 share/html/Elements/CollectionAsTable/Row    |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 67bd88f80dc2959f0e6d1c675e4eed0d407431aa
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 2 12:57:38 2010 +0800

    in case title is not defined

diff --git a/share/html/Elements/CollectionAsTable/Header b/share/html/Elements/CollectionAsTable/Header
index deae5c1..1f97d4d 100644
--- a/share/html/Elements/CollectionAsTable/Header
+++ b/share/html/Elements/CollectionAsTable/Header
@@ -105,6 +105,10 @@ foreach my $col ( @Format ) {
             Attr  => 'title',
         );
         $title = ProcessColumnMapValue( $tmp, Arguments => [ $attr ] );
+
+        # in case title is not defined in ColumnMap 
+        # the following regex changes $attr like from "ReferredToBy" to "Referred To By"
+        $title = join ' ', split /(?<=[a-z])(?=[A-Z])/, $attr unless defined $title;
     } else {
         $title = $m->comp('/Elements/ScrubHTML', Content => $title);
     }

commit b4121d9de84ba37a9fb5e14d7c63431f9f483c51
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Aug 2 13:03:42 2010 +0800

    tiny warning fix

diff --git a/share/html/Elements/CollectionAsTable/Row b/share/html/Elements/CollectionAsTable/Row
index 1ce803f..b87f3ea 100644
--- a/share/html/Elements/CollectionAsTable/Row
+++ b/share/html/Elements/CollectionAsTable/Row
@@ -131,7 +131,7 @@ foreach my $column (@Format) {
             Arguments => [$record, $i],
         );
     }
-    s/\n/<br \/>/gs for @out;
+    s/\n/<br \/>/gs for grep { defined } @out;
 
     $m->out( $_ .'="'. $m->interp->apply_escapes( $attrs{$_} => 'h' ) .'"' )
         foreach grep $attrs{$_}, qw(align style colspan);

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


More information about the Rt-commit mailing list