You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2013/05/30 07:02:14 UTC
svn commit: r1487748 - in /perl/embperl/trunk/Embperl/Form/Control:
checkbox.pm datetime.pm selectdyn.pm
Author: richter
Date: Thu May 30 05:02:13 2013
New Revision: 1487748
URL: http://svn.apache.org/r1487748
Log:
Embperl::Form
Modified:
perl/embperl/trunk/Embperl/Form/Control/checkbox.pm
perl/embperl/trunk/Embperl/Form/Control/datetime.pm
perl/embperl/trunk/Embperl/Form/Control/selectdyn.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=1487748&r1=1487747&r2=1487748&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/checkbox.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/checkbox.pm Thu May 30 05:02:13 2013
@@ -83,7 +83,7 @@ sub show_control_readonly
my $val = $self -> {value} ;
$val = 1 if ($val eq '') ;
- $self -> {force_name} = '_opt_' . $self -> {name} ;
+ local $self -> {force_name} = '_opt_' . $self -> {name} ;
$self -> SUPER::show_control_readonly ($req, $fdat{$name} eq $val?'X':'-') ;
}
Modified: perl/embperl/trunk/Embperl/Form/Control/datetime.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/datetime.pm?rev=1487748&r1=1487747&r2=1487748&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/datetime.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/datetime.pm Thu May 30 05:02:13 2013
@@ -60,7 +60,7 @@ sub init_data
my $time = $fdat->{$name} ;
return if ($time eq '' || $req -> {"ef_datetime_init_done_$name"}) ;
- if ($self -> {dynamic} && ($time =~ /^\s*((?:d|m|y)(?:\+|-)?(?:\d+)?)\s*$/))
+ if ($self -> {dynamic} && ($time =~ /^\s*((?:d|m|y|q)(?:\+|-)?(?:\d+)?)\s*$/))
{
$fdat->{$name} = $1 ;
@@ -106,7 +106,7 @@ sub prepare_fdat
my $date = $fdat -> {$name} ;
return if ($date eq '') ;
- if ($self -> {dynamic} && ($date =~ /^\s*((?:d|m|y)\s*(?:\+|-)?\s*(?:\d+)?)\s*$/))
+ if ($self -> {dynamic} && ($date =~ /^\s*((?:d|m|y|q)\s*(?:\+|-)?\s*(?:\d+)?)\s*$/))
{
$fdat->{$name} = $1 ;
$fdat->{$name} =~ s/\s//g ;
Modified: perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm?rev=1487748&r1=1487747&r2=1487748&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm Thu May 30 05:02:13 2013
@@ -100,14 +100,13 @@ __EMBPERL__
# show_control_readonly - output the control as readonly
#]
-[$ sub show_control_readonly ($self, $req, $value)
+[$ sub xshow_control_readonly ($self, $req, $value)
-my $id = $req -> {uuid} . '_' . $self -> {name} ;
+#my $id = $req -> {uuid} . '_' . $self -> {name} ;
#my $url = $self -> {popupurl} ;
#$url =~ s/<id>/$self -> get_id_from_value ($Embperl::fdat{$self -> {name}})/e ;
-$self -> {force_name} = '_opt_' . $self -> {name} ;
$]
[- $self -> SUPER::show_control_readonly ($req, $value) ; -]
[#<script>add_qtip($('#[+ $id +]'), '[+ $url +]');</script>#]
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org