[Rt-commit] r18048 - in rt/3.999/branches/merge_to_3.8.2: share/html/Elements/CollectionAsTable

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Jan 29 09:43:15 2009
New Revision: 18048

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/ParseFormat

Log:
 r19274 at sunnavys-mb:  sunnavy | 2009-01-29 22:26:22 +0800
 merged share/html/Elements/CollectionAsTable/ParseFormat


Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/ParseFormat
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/ParseFormat	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/CollectionAsTable/ParseFormat	Thu Jan 29 09:43:15 2009
@@ -65,6 +65,8 @@
         title => '',
     };
 
+    $m->callback(callbackname => 'PreColumn', column => $colref, col => \$col);
+
     if ( $col =~ s!/STYLE:([^/]+)!!io ) {
         $colref->{'style'} = $1;
     }
@@ -77,6 +79,9 @@
     if ( $col =~ s!/ALIGN:([^\/]+)!!io ) {
         $colref->{'align'} = $1;
     }
+    if ( $col =~ s!/SPAN:([^\/]+)!!io ) {
+        $colref->{'span'} = $1;
+    }
     if ( $col =~ /__(.*?)__/io ) {
         my @subcols;
         while ( $col =~ s/^(.*?)__(.*?)__//o ) {
@@ -99,7 +104,12 @@
         $colref->{'attribute'} = $1;
     }
 
+    $m->callback(callbackname => 'PostColumn', column => $colref, col => \$col);
+
     push @Columns, $colref;
 }
-    return(@Columns);
+
+$m->callback(callbackname => 'PostProcess', columns => \@Columns, format => $format);
+
+return(@Columns);
 </%init>