richter at apache
Jun 9, 2013, 8:17 PM
Post #1 of 1
(70 views)
Permalink
|
|
svn commit: r1491332 - in /perl/embperl/trunk/Embperl/Form: Control.pm Control/age.pm Control/selectdyn.pm Control/tabs.pm ControlMultValue.pm
|
|
Author: richter
Date: Mon Jun 10 03:17:28 2013
New Revision: 1491332
URL: http://svn.apache.org/r1491332
Log:
Embperl::Form
Modified:
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/Control/age.pm
perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
perl/embperl/trunk/Embperl/Form/Control/tabs.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=1491332&r1=1491331&r2=1491332&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Mon Jun 10 03:17:28 2013
@@ -111,6 +111,19 @@ sub is_readonly
# ---------------------------------------------------------------------------
#
+# is_with_id - returns true if the control shows something that has an internal id
+#
+
+sub is_with_id
+
+ {
+ my ($self, $req) = @_ ;
+
+ return 0 ;
+ }
+
+# ---------------------------------------------------------------------------
+#
# is_hidden - returns true if this is a hidden control
#
@@ -322,7 +335,7 @@ sub get_value
my ($self, $req) = @_ ;
my $fdat = $req -> {docdata} || \%Embperl::fdat ;
- my $name = $self -> {name} ;
+ my $name = $self -> {srcname} || $self -> {force_name} || $self -> {name} ;
return $fdat -> {$name} ;
my $dataprefix = $self -> {dataprefix} ;
@@ -476,9 +489,13 @@ $]
[.$ sub show_control_readonly ($self, $req, $value)
-$value = $self -> {value} || $fdat{$self -> {name}} if (!defined($value)) ;
+$value = $self -> get_value ($req) if (!defined ($value)) ;
+my $name = $self -> {force_name} || $self -> {name} ;
$]
-<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, '', 'readonly') } +] _ef_divname="[+$self -> {force_name} || $self -> {name}+]">[+ $value +]</div>
+<div [.+ do { local $escmode = 0 ; $self -> get_std_control_attr($req, '', 'readonly') } +] _ef_divname="[+ $name +]">[+ $value +]</div>
+[$ if $self->{hidden} $]
+<input type="hidden" name="[+ $name +]" value="[+ $value +]">
+[$endif$]
[$endsub$]
[.# ---------------------------------------------------------------------------
@@ -493,7 +510,7 @@ sub show_control_readonly_array
{
my ($self, $req, $value) = @_ ;
- $value = $self -> {value} || $fdat{$self -> {name}} if (!defined($value)) ;
+ $value = $self -> get_value ($req) if (!defined ($value)) ;
if (ref ($value) eq 'ARRAY')
{
Modified: perl/embperl/trunk/Embperl/Form/Control/age.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/age.pm?rev=1491332&r1=1491331&r2=1491332&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/age.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/age.pm Mon Jun 10 03:17:28 2013
@@ -64,6 +64,7 @@ sub init_data
$year2,$mon2,$mday2, $hour2,$min2,$sec2) } ;
$fdat->{$name} = $Dd > 0?"${Dd}Tage":sprintf ('%d:%02dh', $Dh, $Dm) ;
+ $fdat->{'_tt_' . $name} = sprintf('%d.%02d.%04d %d:%02d', $mday, $mon, $year, $hour, $min) ;
$req -> {"ef_age_init_done_$name"} = 1 ;
}
Modified: perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm?rev=1491332&r1=1491331&r2=1491332&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/selectdyn.pm Mon Jun 10 03:17:28 2013
@@ -49,18 +49,14 @@ sub get_std_control_attr
sub init_data
{
my ($self, $req) = @_ ;
-
- my $fdat = $req -> {docdata} || \%fdat ;
- my $opt ;
- my $id ;
- my $name = $self -> {name} ;
- my $val = $fdat -> {$name} ;
+
+ my $val = $self -> get_value ($req) ;
if ($val ne '')
{
- $opt = $self -> get_option_from_value ($val, $req) ;
- $id = $self -> get_id_from_value ($val, $req) ;
- $fdat -> {"_opt_$name"} = $opt ;
- $fdat -> {"_id_$name"} = $id ;
+ 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) ;
}
}
Modified: perl/embperl/trunk/Embperl/Form/Control/tabs.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/tabs.pm?rev=1491332&r1=1491331&r2=1491332&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/tabs.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/tabs.pm Mon Jun 10 03:17:28 2013
@@ -111,7 +111,12 @@ $]
[$if ($activeid && $form->{id} ne $activeid) $] style="display: none" [$endif$]
>
-[$if (!$form -> {noframe}) $]<div class="ef-tabs-separator ui-accordion-header ui-helper-reset ui-state-default ui-accordion-icons ui-corner-top"><span class="ui-accordion-header-icon ui-icon ui-icon-triangle-1-s ef-icon" title="Verstecken/Anzeigen"></span><span class="ef-tabs-separator-header-text">[+ $form -> {text} +]</span></div><table class="ef-tabs-border-cell [+ $class +]"><tr><td class="ef-tabs-content-cell"> [$endif$]
+[$if (!$form -> {noframe}) $]
+ <div class="ef-tabs-separator ui-accordion-header ui-helper-reset ui-state-default ui-accordion-icons ui-corner-top"><span class="ui-accordion-header-icon ui-icon ui-icon-triangle-1-s ef-icon" title="Verstecken/Anzeigen"></span><span class="ef-tabs-separator-header-text">[+ $form -> {text} +]</span></div>
+ [#<table class="ef-tabs-border-cell [+ $class +]"><tr><td class="ef-tabs-content-cell"> #]
+ <div class="ef-tabs-border-cell [+ $class +]"><div class="ef-tabs-content-cell">
+
+[$endif$]
[$endsub$]
@@ -123,7 +128,8 @@ $]
[$sub show_subform_controls_end ($self, $form, $req)
$]
-[$ if (!$form -> {noframe}) $]</td></tr></table> [$endif$]
+[# [$ if (!$form -> {noframe}) $]</td></tr></table> [$endif$] #]
+[$ if (!$form -> {noframe}) $]</div></div> [$endif$]
</div>
[$endsub$]
Modified: perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/ControlMultValue.pm?rev=1491332&r1=1491331&r2=1491332&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/ControlMultValue.pm (original)
+++ perl/embperl/trunk/Embperl/Form/ControlMultValue.pm Mon Jun 10 03:17:28 2013
@@ -273,6 +273,19 @@ sub get_active_id
return $req -> {$key} = $activeid ;
}
+# ---------------------------------------------------------------------------
+#
+# is_with_id - returns true if the control shows something that has an internal id
+#
+
+sub is_with_id
+
+ {
+ my ($self, $req) = @_ ;
+
+ return 1 ;
+ }
+
# ------------------------------------------------------------------------------------------
#
# init_data - daten aufteilen
@@ -287,8 +300,10 @@ sub init_data
my $val = $self -> get_value ($req) ;
if ($val ne '')
{
- my $fdat = $req -> {docdata} || \%Embperl::fdat ;
- $fdat -> {"_opt_$self->{name}"} = $self -> get_option_from_value ($val, $req) ;
+ 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) ;
}
}
@@ -301,13 +316,33 @@ sub show_control_readonly
{
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) = @_ ;
+
+=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, defined ($option)?$option:'') ;
+ $self -> SUPER::show_control_readonly_array ($req, $value) ;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe [at] perl
For additional commands, e-mail: embperl-cvs-help [at] perl
|
