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/06/18 10:03:25 UTC
svn commit: r1494059 - in /perl/embperl/trunk/Embperl/Form: Control.pm
Control/selectdyn.pm ControlMultValue.pm
Author: richter
Date: Tue Jun 18 08:03:25 2013
New Revision: 1494059
URL: http://svn.apache.org/r1494059
Log:
fix readonly display of select & radio
Modified:
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1494059&r1=1494058&r2=1494059&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Tue Jun 18 08:03:25 2013
@@ -375,6 +375,33 @@ sub get_std_control_attr
return wantarray?($attrs, $ctrlid, $name):$attrs ;
}
+# ------------------------------------------------------------------------------------------
+#
+# get_display_text - returns the text that should be displayed
+#
+
+sub get_display_text
+ {
+ my ($self, $req, $value) = @_ ;
+
+ $value = $self -> get_value ($req) if (!defined ($value)) ;
+
+ return $value ;
+ }
+
+# ---------------------------------------------------------------------------
+#
+# get_id_from_value - returns id for a given value
+#
+
+sub get_id_from_value
+
+ {
+ #my ($self, $value) = @_ ;
+
+ return ;
+ }
+
1 ;
@@ -489,10 +516,10 @@ $]
[$ sub show_control_readonly ($self, $req, $value)
-$value = $self -> get_value ($req) if (!defined ($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_divname="[+ $name +]">[+ $value +]</div>
+<div [+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, '', 'readonly') } +] _ef_divname="[+ $name +]">[+ $text +]</div>
[$ if $self->{hidden} $]
<input type="hidden" name="[+ $name +]" value="[+ $value +]">
[$endif$]
Modified: perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm?rev=1494059&r1=1494058&r2=1494059&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm Tue Jun 18 08:03:25 2013
@@ -91,24 +91,6 @@ sub show_control_addons
__EMBPERL__
-[# ---------------------------------------------------------------------------
-#
-# show_control_readonly - output the control as readonly
-#]
-
-[$ sub xshow_control_readonly ($self, $req, $value)
-
-#my $id = $req -> {uuid} . '_' . $self -> {name} ;
-
-#my $url = $self -> {popupurl} ;
-#$url =~ s/<id>/$self -> get_id_from_value ($Embperl::fdat{$self -> {name}})/e ;
-
-$]
-[- $self -> SUPER::show_control_readonly ($req, $value) ; -]
-[#<script>add_qtip($('#[+ $id +]'), '[+ $url +]');</script>#]
-[$endsub$]
-
-
[# ---------------------------------------------------------------------------
#
Modified: perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/ControlMultValue.pm?rev=1494059&r1=1494058&r2=1494059&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/ControlMultValue.pm (original)
+++ perl/embperl/trunk/Embperl/Form/ControlMultValue.pm Tue Jun 18 08:03:25 2013
@@ -178,6 +178,7 @@ sub get_id_from_value
{
my ($self, $value) = @_ ;
+ return if (!$self -> {datasrcobj}) ;
return $self -> {datasrcobj} -> get_id_from_value ($value) ;
}
@@ -288,63 +289,19 @@ sub is_with_id
# ------------------------------------------------------------------------------------------
#
-# init_data - daten aufteilen
+# get_display_text - returns the text that should be displayed
#
-sub init_data
- {
- my ($self, $req, $grid) = @_ ;
-
- return if (!$self -> is_readonly() && (!$grid || !$grid -> is_readonly())) ;
-
- my $val = $self -> get_value ($req) ;
- if ($val ne '')
- {
- my $name = $self -> {name} ;
- my $fdat = $req -> {docdata} || \%Embperl::fdat ;
- $fdat -> {'_opt_' . $name} = $self -> get_option_from_value ($val, $req) ;
- $fdat -> {'_id_' . $name} = $self -> get_id_from_value ($val, $req) ;
- }
- }
-
-# ---------------------------------------------------------------------------
-#
-# show_control_readonly - output readonly control
-#
-
-sub show_control_readonly
+sub get_display_text
{
my ($self, $req, $value) = @_ ;
-
-=pod
- $value = $self -> get_value ($req) if (!defined ($value)) ;
- my $option = $self -> get_option_from_value ($value, $req) ;
- $option = '<Kein Zugriff>' if (!$option && $value && ($req->{userCtx}{role} ne '*')) ;
-=cut
- local $self -> {force_name} = '_opt_' . $self -> {name} ;
- $self -> SUPER::show_control_readonly ($req, $value) ;
- }
-
-# ---------------------------------------------------------------------------
-#
-# show_control_readonly - output readonly control
-#
-
-sub show_control_readonly_array
- {
- my ($self, $req, $value) = @_ ;
+ $value = $self -> get_value ($req) if (!defined ($value)) ;
+ $value = $self -> get_option_from_value ($value, $req) ;
-=pod
- $value = $self -> get_value ($req) if (!defined ($value)) ;
- my $option = $self -> get_option_from_value ($value, $req) ;
-
- $option = '<Kein Zugriff>' if (!$option && $value && ($req->{userCtx}{role} ne '*')) ;
-=cut
- local $self -> {force_name} = '_opt_' . $self -> {name} ;
- $self -> SUPER::show_control_readonly_array ($req, $value) ;
+ return $value ;
}
-
+
1 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org