Author: richter
Date: Mon May 26 06:28:26 2014
New Revision: 1597520
URL: http://svn.apache.org/r1597520
Log:
Fix readonly display of grid and state for non ascii fieldnames
Modified:
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/Control/grid.pm
perl/embperl/trunk/Embperl/Form/Control/number.pm
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1597520&r1=1597519&r2=1597520&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Mon May 26 06:28:26 2014
@@ -490,8 +490,10 @@ __EMBPERL__
$fdat{$self -> {name}} = $self -> {default} if ($fdat{$self -> {name}} eq ''
&& exists ($self -> {default})) ;
my $span = 0 ;
+my $state = $self -> {state} ;
+$state =~ s/[^-a-zA-Z0-9_]/_/g ;
-$]<table class="ef-element ef-element-width-[+ $self -> {width_percent} +]
ef-element-[+ $self -> {type} +] [+ $self -> {state} +]">
+$]<table class="ef-element ef-element-width-[+ $self -> {width_percent} +]
ef-element-[+ $self -> {type} +] [+ $state +]">
<tr>
[$ if ($self -> is_blanked ($req)) $]
<td class="ef-label-box ef-label-box-width-100"> </td>
Modified: perl/embperl/trunk/Embperl/Form/Control/grid.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/grid.pm?rev=1597520&r1=1597519&r2=1597520&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/grid.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/grid.pm Mon May 26 06:28:26 2014
@@ -219,6 +219,8 @@ sub init_markup
{
my ($self, $req, $grid, $method) = @_ ;
+ $self -> init_data ($req) if ($self -> is_readonly()) ;
+
my $fdat = $req -> {docdata} || \%fdat ;
my $name = $self->{name} ;
my $i ;
@@ -405,7 +407,7 @@ sub get_display_text
$text = $field -> get_display_text ($req, $rowval -> [$j+1]) ;
push @row, $text if ($text ne '') ;
}
- push @rows, join (', ', @row) ;
+ push @rows, join (', ', @row) if (@row) ;
}
return join (' / ', @rows) ;
}
Modified: perl/embperl/trunk/Embperl/Form/Control/number.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/number.pm?rev=1597520&r1=1597519&r2=1597520&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/number.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/number.pm Mon May 26 06:28:26 2014
@@ -42,6 +42,7 @@ sub get_display_text
$value = $self -> get_value ($req) if (!defined ($value)) ;
+ return if ($value eq '') ;
return $value + 0 ;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
