projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import rt 3.6.4
[freeside.git]
/
rt
/
html
/
Elements
/
CollectionAsTable
/
ParseFormat
diff --git
a/rt/html/Elements/CollectionAsTable/ParseFormat
b/rt/html/Elements/CollectionAsTable/ParseFormat
index
57434ef
..
2270760
100644
(file)
--- a/
rt/html/Elements/CollectionAsTable/ParseFormat
+++ b/
rt/html/Elements/CollectionAsTable/ParseFormat
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-200
5
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-200
7
Best Practical Solutions, LLC
%# <jesse@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <jesse@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-22,7
+22,9
@@
%#
%# You should have received a copy of the GNU General Public License
%# along with this program; if not, write to the Free Software
%#
%# You should have received a copy of the GNU General Public License
%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/copyleft/gpl.html.
%#
%#
%# CONTRIBUTION SUBMISSION POLICY:
%#
%#
%# CONTRIBUTION SUBMISSION POLICY:
@@
-48,7
+50,7
@@
$Format
</%ARGS>
<%init>
</%ARGS>
<%init>
-use Regexp::Common;
+use Regexp::Common
qw/delimited/
;
my @Columns;
while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) {
my @Columns;
while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) {
@@
-59,7
+61,9
@@
while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) {
substr($col,-1,1) = "";
}
substr($col,-1,1) = "";
}
- my $colref;
+ my $colref = {
+ title => '',
+ };
if ( $col =~ s!/STYLE:([^/]+)!!io ) {
$colref->{'style'} = $1;
if ( $col =~ s!/STYLE:([^/]+)!!io ) {
$colref->{'style'} = $1;
@@
-88,7
+92,7
@@
while ($Format =~ /($RE{delimited}{-delim=>qq{\'"}}|[{}\w.]+)/go) {
$colref->{'attribute'} = $col;
}
$colref->{'attribute'} = $col;
}
- if ( !$colref->{'title'} && grep { /^__(.
*
?)__$/io }
+ if ( !$colref->{'title'} && grep { /^__(.
+
?)__$/io }
@{ $colref->{'output'} } )
{
$colref->{'title'} = $1;
@{ $colref->{'output'} } )
{
$colref->{'title'} = $1;