Author: richter
Date: Tue Dec 27 15:20:21 2011
New Revision: 1224925
URL: http://svn.apache.org/viewvc?rev=1224925&view=rev
Log:
Fix Embperl::Form
Modified:
perl/embperl/trunk/Embperl/Form.pm
perl/embperl/trunk/Embperl/Form/Control.pm
perl/embperl/trunk/Embperl/Form/Control/checkbox.pm
perl/embperl/trunk/Embperl/Form/Control/input.pm
perl/embperl/trunk/Embperl/Form/Control/password.pm
perl/embperl/trunk/Embperl/Form/Control/select.pm
perl/embperl/trunk/Embperl/Form/Control/textarea.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=1224925&r1=1224924&r2=1224925&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form.pm (original)
+++ perl/embperl/trunk/Embperl/Form.pm Tue Dec 27 15:20:21 2011
@@ -395,7 +395,7 @@ sub layout
push @$hidden, $control ;
next ;
}
- my $width = $control -> {width_percent} || int($max_x / ($control ->
{width} || 2)) ;
+ my $width = ($control -> {width} eq 'expand')?100:$control ->
{width_percent} || int($max_x / ($control -> {width} || 2)) ;
$width = 21 if ($x == 0 && $width < 21) ;
if ($x + $width > $max_x || $control -> {newline} > 0 || (($control ->
{sublines} || $control -> {subobjects}) && @$line))
{ # new line
@@ -410,7 +410,7 @@ sub layout
$num = 0 ;
}
push @$line, $control ;
- $control -> {width_percent} = int($width) ;
+ $control -> {width_percent} = $control -> {width} eq
'expand'?'expand':int($width) ;
$control -> {x_percent} = int($x) ;
$control -> {level} = $level ;
$x += $width ;
@@ -905,7 +905,7 @@ $]
#]
[$sub show_controls_end ($self, $req) $]
-<!-- </table> -->
+
[$ if (!$self -> {noframe}) $]</td></tr></table> [$endif$]
</div>
@@ -969,12 +969,12 @@ $]
}
my $class = $lineno == 0?'cTableRow1':'cTableRow' ;
-$]<!-- line begin
- <tr class="[+ $class +]" valign="[+ $self->{valign} +]"
+$]<!-- line begin -->
+ [# <tr class="[+ $class +]" valign="[+ $self->{valign} +]"
[$if $id $] id="[+ $id +]" [$endif$]
[$if ($activeid eq '-' || ($baseid eq $baseaid && $baseidn != $baseaidn))
$] style="display: none" [$endif$]
>
- -->[* return !($activeid eq '-' || ($baseid eq $baseaid && $baseidn !=
$baseaidn))
+ #][* return !($activeid eq '-' || ($baseid eq $baseaid && $baseidn !=
$baseaidn))
*][$endsub$]
[# ---------------------------------------------------------------------------
@@ -982,7 +982,7 @@ $]<!-- line begin
# show_line_end - output end of line
#]
-[$ sub show_line_end ($req) $]<!-- </tr> -->[$endsub$]
+[$ sub show_line_end ($req) $]<!-- line end -->[$endsub$]
__END__
Modified: perl/embperl/trunk/Embperl/Form/Control.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control.pm?rev=1224925&r1=1224924&r2=1224925&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control.pm Tue Dec 27 15:20:21 2011
@@ -269,7 +269,7 @@ sub get_std_control_attr
my $events = $self -> {eventattrs} ;
$type ||= $self -> {type} ;
- return qq{class="ef-control ef-control-width-$width ef-control-$type
ef-control-$type-width-$width $addclass $class" name="$name" id="$ctrlid"
$events} ;
+ return qq{class="ef-control ef-control-width-$width ef-control-$type
ef-control-$type-width-$width $addclass $class" id="$ctrlid" $events} ;
}
@@ -312,7 +312,7 @@ $]<table class="ef-element ef-element-wi
my $span = $self->{width_percent} ;
$]
-</tr><tr><td class="cBase cTabTD" colspan="[+ $span +]">
+<!-- sub begin --></tr><tr><td class="cBase cTabTD" colspan="[+ $span +]">
[$endsub$]
[# ---------------------------------------------------------------------------
@@ -321,7 +321,7 @@ $]
#]
[$sub show_sub_end ($self, $req) $]
-</td>
+</td><!-- sub end -->
[$endsub$]
[# ---------------------------------------------------------------------------
Modified: perl/embperl/trunk/Embperl/Form/Control/checkbox.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/checkbox.pm?rev=1224925&r1=1224924&r2=1224925&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/checkbox.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/checkbox.pm Tue Dec 27 15:20:21 2011
@@ -90,7 +90,7 @@ __EMBPERL__
push @{$self -> form -> {fields2empty}}, $name ;
$]
-<input type="checkbox" [+ do { local $escmode = 0 ; $self -> {eventattrs} }
+] value="[+ $val +]"
+<input type="checkbox" name="[+ $self -> {force_name} || $self -> {name} +]"
[+ do { local $escmode = 0 ; $self -> {eventattrs} } +] value="[+ $val +]"
[$if ($self -> {sublines} || $self -> {subobjects}) $] OnClick="[+ $nsprefix
+]show_checked(document, this)" [$endif$]
>
[$endsub$]
Modified: perl/embperl/trunk/Embperl/Form/Control/input.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/input.pm?rev=1224925&r1=1224924&r2=1224925&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/input.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/input.pm Tue Dec 27 15:20:21 2011
@@ -35,8 +35,7 @@ __EMBPERL__
#$self -> {size} ||= 80 / ($self -> {width} || 2) ;
my $class = $self -> {class} ;
$]
-
-<input type="text" [+ do { local $escmode = 0 ; $self ->
get_std_control_attr() } +]
+<input type="text" name="[+ $self -> {force_name} || $self -> {name} +]" [+ do
{ local $escmode = 0 ; $self -> get_std_control_attr() } +]
[$if $self -> {size} $]size="[+ $self->{size} +]"[$endif$]
[$if $self -> {maxlength} $]maxlength="[+ $self->{maxlength} +]"[$endif$]
>
Modified: perl/embperl/trunk/Embperl/Form/Control/password.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/password.pm?rev=1224925&r1=1224924&r2=1224925&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/password.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/password.pm Tue Dec 27 15:20:21 2011
@@ -32,7 +32,7 @@ __EMBPERL__
[$ sub show_control ($self) $]
-<input type="password" class="cBase cControl cControlWidthInput" name="[+
$self->{name} +]"
+<input type="password" name="[+ $self -> {force_name} || $self -> {name} +]"
[+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +]
[$if $self -> {size} $]size="[+ $self->{size} +]"[$endif$]
[$if $self -> {maxlength} $]size="[+ $self->{maxlength} +]"[$endif$]
>
Modified: perl/embperl/trunk/Embperl/Form/Control/select.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/select.pm?rev=1224925&r1=1224924&r2=1224925&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/select.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/select.pm Tue Dec 27 15:20:21 2011
@@ -52,7 +52,7 @@ __EMBPERL__
my ($values, $options) = $self -> get_all_values ($req) ;
$]
-<select [+ $self->{multiple}?'multiple':''+] [+ do { local $escmode = 0 ;
$self -> get_std_control_attr() } +]
+<select name="[+ $self -> {force_name} || $self -> {name} +]" [+
$self->{multiple}?'multiple':''+] [+ do { local $escmode = 0 ; $self ->
get_std_control_attr() } +]
[$if ($self -> {sublines} || $self -> {subobjects}) $] OnChange="[+ $nsprefix
+]show_selected(document, this)" [$endif$]
[$if ($self -> {rows}) $] size="[+ $self->{rows} +]" [$endif$]
>
Modified: perl/embperl/trunk/Embperl/Form/Control/textarea.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Control/textarea.pm?rev=1224925&r1=1224924&r2=1224925&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/Control/textarea.pm (original)
+++ perl/embperl/trunk/Embperl/Form/Control/textarea.pm Tue Dec 27 15:20:21 2011
@@ -34,7 +34,7 @@ __EMBPERL__
my $class = $self -> {class} ||= '' ;
$]
-<textarea type="text" [+ do { local $escmode = 0 ; $self ->
get_std_control_attr() } +]
+<textarea type="text" name="[+ $self -> {force_name} || $self -> {name} +]"
[+ do { local $escmode = 0 ; $self -> get_std_control_attr() } +]
[# [$if $self -> {cols} $]cols="[+ $self->{cols} +]"[$endif$] #]
[$if $self -> {rows} $]rows="[+ $self->{rows} +]"[$endif$]
></textarea>
Modified: perl/embperl/trunk/Embperl/Form/ControlMultValue.pm
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/ControlMultValue.pm?rev=1224925&r1=1224924&r2=1224925&view=diff
==============================================================================
--- perl/embperl/trunk/Embperl/Form/ControlMultValue.pm (original)
+++ perl/embperl/trunk/Embperl/Form/ControlMultValue.pm Tue Dec 27 15:20:21 2011
@@ -281,6 +281,8 @@ sub show_control_readonly
my $value = $self -> get_value ($req) ;
my $option = $self -> get_option_from_value ($value, $req) ;
+ $option = '<Kein Zugriff>' if (!$option && $value &&
($req->{userCtx}{role} ne '*')) ;
+
$self -> SUPER::show_control_readonly ($req, $option) ;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
