svn commit: r1640362 - /perl/embperl/trunk/Embperl/Form/Control/checkbox.pm

[richter]

Author: richter
Date: Tue Nov 18 15:09:37 2014
New Revision: 1640362

URL: http://svn.apache.org/r1640362
Log:
Fix readonly checkbox

Modified:
    perl/embperl/trunk/Embperl/Form/Control/checkbox.pm

Modified: perl/embperl/trunk/Embperl/Form/Control/checkbox.pm
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/checkbox.pm?rev=1640362&r1=1640361&r2=1640362&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/checkbox.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/checkbox.pm Tue Nov 18 15:09:37 2014
@@ -75,7 +75,7 @@ sub init_data
 #   show_control_readonly - output readonly control
 #
 
-sub show_control_readonly
+sub xshow_control_readonly
     {
     my ($self, $req) = @_ ;
 
@@ -105,6 +105,28 @@ sub get_display_text
     return $fdat->{$name} eq $val?'X':'-' ;
     }
 
+# ---------------------------------------------------------------------------
+#
+#   init_markup - add any dynamic markup to the form data
+#
+
+sub init_markup
+
+    {
+    my ($self, $req, $parentctl, $method) = @_ ;
+
+    return if (!$self -> is_readonly($req) && (! $parentctl || ! $parentctl -> 
is_readonly($req))) ;
+    
+    my $val = $self -> get_value ($req) ;
+    if ($val ne '')
+        {
+        my $name = $self -> {name} ;
+        my $fdat = $req -> {docdata} || \%Embperl::fdat ;
+        my $opt  = $self -> get_display_text ($req, $val) ;
+        $fdat -> {'_opt_' . $name} = $opt if ($opt ne '') ;
+        }
+    }
+    
 
 1 ;
 
@@ -112,6 +134,22 @@ __EMBPERL__
 
 [# ---------------------------------------------------------------------------
 #
+#   show_control_readonly - output the control as readonly
+#]
+
+[$ sub show_control_readonly ($self, $req, $value) 
+
+my $text  = $self -> get_display_text ($req, $value)  ;
+my $name  = $self -> {force_name} || $self -> {name} ;
+$]
+<div [+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, '', 
'readonly', 'ef-control-with-id') } +] _ef_divname="_opt_[+ $name +]">[+ $text 
+]</div>
+[$ if $self->{hidden} $]
+<input type="hidden" name="[+ $name +]" value="[+ $value +]">
+[$endif$]
+[$endsub$]
+
+[# ---------------------------------------------------------------------------
+#
 #   show_control - output the control
 #]
 



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