[TWiki-Dev] CVS: twiki/lib/TWiki Form.pm,1.24,1.25

[Peter T. <pet...@us...>]

Update of /cvsroot/twiki/twiki/lib/TWiki
In directory usw-pr-cvs1:/tmp/cvs-serv30639/TWiki

Modified Files:
	Form.pm 
Log Message:
Expand variables in form fields

Index: Form.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki/Form.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** Form.pm	2001/11/01 10:30:49	1.24
--- Form.pm	2001/12/22 06:53:41	1.25
***************
*** 287,294 ****
              foreach my $item ( @fieldInfo ) {
                  my $flag = "";
                  if( $value =~ /(^|,\s*)$item(,|$)/ ) {
                      $flag = ' checked="checked"';
                  }
!                 $val .= "\n<td><input type=\"checkbox\" name=\"$name$item\"$flag />$item &nbsp;&nbsp;</td>";
                  if( $size > 0 && ($lines % $size == $size - 1 ) ) {
                     $val .= "\n</tr><tr>";
--- 287,295 ----
              foreach my $item ( @fieldInfo ) {
                  my $flag = "";
+                 my $expandedItem = &TWiki::handleCommonTags( $item );
                  if( $value =~ /(^|,\s*)$item(,|$)/ ) {
                      $flag = ' checked="checked"';
                  }
!                 $val .= "\n<td><input type=\"checkbox\" name=\"$name$item\"$flag />$expandedItem &nbsp;&nbsp;</td>";
                  if( $size > 0 && ($lines % $size == $size - 1 ) ) {
                     $val .= "\n</tr><tr>";
***************
*** 304,307 ****
--- 305,309 ----
              foreach my $item ( @fieldInfo ) {
                  my $selected = $defaultMarker;
+                 my $expandedItem = &TWiki::handleCommonTags( $item );
                  if( $item eq $value ) {
                     $selected = 'checked="checked"';
***************
*** 309,313 ****
                  }
                  $defaultMarker = "";
!                 $val .= "\n<td><input type=\"radio\" name=\"$name\" value=\"$item\" $selected />$item &nbsp;&nbsp;</td>";
                  if( $size > 0 && ($lines % $size == $size - 1 ) ) {
                     $val .= "\n</tr><tr>";
--- 311,315 ----
                  }
                  $defaultMarker = "";
!                 $val .= "\n<td><input type=\"radio\" name=\"$name\" value=\"$item\" $selected />$expandedItem &nbsp;&nbsp;</td>";
                  if( $size > 0 && ($lines % $size == $size - 1 ) ) {
                     $val .= "\n</tr><tr>";