Author: richter
Date: Mon Apr 8 06:47:23 2013
New Revision: 1465539
URL: http://svn.apache.org/r1465539
Log:
Embperl::Form
Modified:
perl/embperl/trunk/Embperl/Form.pm
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/Control/checkbox.pm
perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm
Modified: perl/embperl/trunk/Embperl/Form.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form.pm?rev=1465539&r1=1465538&r2=1465539&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form.pm (original)
+++ perl/embperl/trunk/Embperl/Form.pm Mon Apr 8 06:47:23 2013
@@ -538,9 +538,9 @@ sub show_controls
$control -> show_sub_begin ($req) ;
foreach my $subobj (@{$control -> {subobjects}})
{
-::dbg( $subobj -> is_disabled ($req) ) ;
+
next if (!$subobj || !$subobj -> {controls} || !@{$subobj
-> {controls}} || $subobj -> is_disabled ($req)) ;
-::dbg('show') ;
+
$subobj -> show ($req, $activesubid[$control -> {level}]) ;
}
$control -> show_sub_end ($req) ;
@@ -639,9 +639,9 @@ sub is_disabled
my ($self, $req) = @_ ;
my $disable = $self -> {disable} ;
-::dbg($disable) ;
+
$disable = &{$disable}($self, $req) if (ref ($disable) eq 'CODE') ;
-::dbg($disable) ;
+
return $disable ;
}
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1465539&r1=1465538&r2=1465539&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Mon Apr 8 06:47:23 2013
@@ -323,6 +323,7 @@ sub get_value
my $fdat = $req -> {docdata} || \%Embperl::fdat ;
my $name = $self -> {name} ;
+ return $fdat -> {$name} ;
my $dataprefix = $self -> {dataprefix} ;
return $fdat -> {$name} if (!$dataprefix) ;
Modified: perl/embperl/trunk/Embperl/Form/Control/checkbox.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/checkbox.pm?rev=1465539&r1=1465538&r2=1465539&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/checkbox.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/checkbox.pm Mon Apr 8 06:47:23 2013
@@ -67,7 +67,6 @@ sub init_data
my $value = $self -> {value} ;
$value = 1 if ($value eq '') ;
my $fdat = $req -> {docdata} || \%Embperl::fdat ;
-::dbg($val, $self->{value}) ;
$fdat -> {"_opt_$self->{name}"} = $value eq $val?'X':'-' ;
}
Modified: perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm?rev=1465539&r1=1465538&r2=1465539&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/dynctrl.pm Mon Apr 8 06:47:23 2013
@@ -72,7 +72,6 @@ sub create_ctrl
$ctrl -> {text} = $ctrl -> {textprefix} . $ctrl -> {text} if ($ctrl ->
{textprefix}) ;
my $form = $self -> form ;
my $ctrlform = [$ctrl] ;
-::dbg($self->{name}, $ctrlform) ;
$form -> new_controls ($ctrlform, undef, undef, undef, undef, undef,
undef, 1) ;
return $req -> {"dynctrl_$id"} = $ctrlform -> [0] ;
@@ -156,7 +155,7 @@ $]<div style="display: inline" _ef_divna
my $ctrl = $self -> create_ctrl ($req) ;
my $name = $self -> {name} ;
-::dbg($name, $req -> {dynctrl_in_show}) ;
+
if ($req -> {dynctrl_in_show})
{
return $ctrl -> show_control ($req) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
