svn commit: r1494862 - in /perl/embperl/trunk/Embperl: Form.pm Form/Control.pm Form/Control/mult.pm Form/ControlMultValue.pm

[richter]

Author: richter
Date: Thu Jun 20 06:00:12 2013
New Revision: 1494862

URL: http://svn.apache.org/r1494862
Log:
fix readonly display

Modified:
    perl/embperl/trunk/Embperl/Form.pm
    perl/embperl/trunk/Embperl/Form/Control.pm
    perl/embperl/trunk/Embperl/Form/Control/mult.pm
    perl/embperl/trunk/Embperl/Form/ControlMultValue.pm

Modified: perl/embperl/trunk/Embperl/Form.pm
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form.pm?rev=1494862&r1=1494861&r2=1494862&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form.pm (original)
+++ perl/embperl/trunk/Embperl/Form.pm Thu Jun 20 06:00:12 2013
@@ -590,11 +590,15 @@ sub show
 sub init_data
 
     {
-    my ($self, $req) = @_ ;
+    my ($self, $req, $options) = @_ ;
 
+    if ($self -> {toplevel} && $options)
+        {
+        $req -> {form_options_masks} = ($options && $options -> {masks}) || {} 
;
+        }
     foreach my $control (@{$self -> {init_data}})
         {
-        $control -> init_data ($req) ;
+        $control -> init_data ($req) if (!$control -> is_disabled ($req)) ;
         }
     }
 
@@ -606,11 +610,15 @@ sub init_data
 sub init_markup
 
     {
-    my ($self, $req, $parentctl, $method) = @_ ;
+    my ($self, $req, $parentctl, $method, $options) = @_ ;
 
+    if ($self -> {toplevel} && $options)
+        {
+        $req -> {form_options_masks} = ($options && $options -> {masks}) || {} 
;
+        }
     foreach my $control (@{$self -> {init_markup}})
         {
-        $control -> init_markup ($req, $parentctl, $method) ;
+        $control -> init_markup ($req, $parentctl, $method)  if (!$control -> 
is_disabled ($req)) ;
         }
     }
 
@@ -622,11 +630,15 @@ sub init_markup
 sub prepare_fdat
 
     {
-    my ($self, $req) = @_ ;
+    my ($self, $req, $options) = @_ ;
 
+    if ($self -> {toplevel} && $options)
+        {
+        $req -> {form_options_masks} = ($options && $options -> {masks}) || {} 
;
+        }
     foreach my $control (@{$self -> {prepare_fdat}})
         {
-        $control -> prepare_fdat ($req) ;
+        $control -> prepare_fdat ($req)  if (!$control -> is_disabled ($req)) ;
         }
     }
     

Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1494862&r1=1494861&r2=1494862&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Thu Jun 20 06:00:12 2013
@@ -103,10 +103,10 @@ sub is_readonly
     {
     my ($self, $req) = @_ ;
 
-    my $redaonly = $self -> {readonly}  || $req -> 
{form_options_masks}{$self->{name}}{readonly} || $req -> 
{form_options_masks}{'*'}{readonly}  ;
-    $redaonly = &{$redaonly}($req) if (ref ($redaonly) eq 'CODE') ;
-    
-    return $redaonly ;
+    my $readonly = $self -> {readonly}  || $req -> 
{form_options_masks}{$self->{name}}{readonly} || $req -> 
{form_options_masks}{'*'}{readonly}  ;
+    $readonly = &{$readonly}($req) if (ref ($readonly) eq 'CODE') ;
+
+    return $readonly ;
     }
 
 # ---------------------------------------------------------------------------

Modified: perl/embperl/trunk/Embperl/Form/Control/mult.pm
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/mult.pm?rev=1494862&r1=1494861&r2=1494862&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/mult.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/mult.pm Thu Jun 20 06:00:12 2013
@@ -151,7 +151,7 @@ sub show 
     Embperl::Form::Control::show (@_) 
     }
     
-sub show_control_readonly { my $self = shift ; $self -> show_control (@_) }
+#sub show_control_readonly { my $self = shift ; $self -> show_control (@_) }
 
 1 ;
 

Modified: perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/ControlMultValue.pm?rev=1494862&r1=1494861&r2=1494862&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/ControlMultValue.pm (original)
+++ perl/embperl/trunk/Embperl/Form/ControlMultValue.pm Thu Jun 20 06:00:12 2013
@@ -312,7 +312,7 @@ sub init_markup
     {
     my ($self, $req, $parentctl, $method) = @_ ;
 
-    return if (!$self -> is_readonly() && (! $parentctl || ! $parentctl -> 
is_readonly())) ;
+    return if (!$self -> is_readonly($req) && (! $parentctl || ! $parentctl -> 
is_readonly($req))) ;
     
     my $val = $self -> get_value ($req) ;
     if ($val ne '')



---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org