Author: richter
Date: Wed Jun 19 08:36:13 2013
New Revision: 1494499
URL: http://svn.apache.org/r1494499
Log:
Embperl::Form fix readonly display
Modified:
perl/embperl/trunk/Embperl/Form/Control/grid.pm
perl/embperl/trunk/Embperl/Form/Control/mult.pm
Modified: perl/embperl/trunk/Embperl/Form/Control/grid.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/grid.pm?rev=1494499&r1=1494498&r2=1494499&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/grid.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/grid.pm Wed Jun 19 08:36:13 2013
@@ -356,21 +356,15 @@ sub get_display_text
my $j ;
my @row ;
my $field ;
+ my $text ;
foreach $fieldname (@$showfields)
{
$j = $allfields -> {$fieldname} ;
$field = $fields -> [$j] ;
next if $field -> is_hidden ;
- if ($field -> {datasrcobj})
- {
- push @row, $field -> get_option_from_value ($value -> [$j+1],
$req) ;
- }
- else
- {
- push @row, $value -> [$j+1] ;
- }
+ $text = $field -> get_display_text ($req, $value -> [$j+1]) ;
+ push @row, $text if ($text ne '') ;
}
-
return join (', ', @row) ;
}
1 ;
Modified: perl/embperl/trunk/Embperl/Form/Control/mult.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/mult.pm?rev=1494499&r1=1494498&r2=1494499&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/mult.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/mult.pm Wed Jun 19 08:36:13 2013
@@ -137,7 +137,10 @@ sub get_display_text
{
my ($self, $req, $value) = @_ ;
- $self -> Embperl::Form::ControlMultValue::show ($req, $value) ;
+ my $field = $self -> {fields}[0] ;
+ return if (!$field) ;
+
+ return $field -> get_display_text ($req, $value) ;
}
#
------------------------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
