--- trunk/lib/Frey/Action.pm	2008/11/25 01:00:16	509
+++ trunk/lib/Frey/Action.pm	2008/12/03 22:23:26	708
@@ -114,17 +114,36 @@
 		qq|<select title="$attr_type" name="$name">$options</select>| if $options;
 	}
 
-	foreach my $name ( grep { ! $class->meta->get_attribute($_)->is_lazy } $self->attributes ) {
+	foreach my $checkbox ( split(/\s+/, $default->{'frey-checkboxes'} ) ) {
+		next if defined $default->{ $checkbox };
+
+		$default->{ $checkbox } = 0;
+		$self->params->{ $checkbox } = 0;
+		warn "# checkbox $checkbox not ticked";
+	}
+
+	my @checkboxes;
+
+	foreach my $name (
+		grep {
+			! $class->meta->get_attribute($_)->is_lazy
+			&& ! defined $default->{$_}
+		} $self->attributes
+	) {
 		my $attr_type = '';
 		my $type = $name =~ m/^pass/ ? 'password' : 'text';
 		my $label = $name;
-		my $value = '';
 		my $label_title = '';
 		my $value_html = '';
 
 		my $attr = $class->meta->get_attribute( $name );
 		$attr_type = $attr->type_constraint->name if $attr->has_type_constraint;
 
+		my $value =
+			defined $default->{$name} ? $default->{$name}       :
+			$attr->has_default        ? $attr->default( $name ) :
+			'';
+
 		if ( ref($config_params) eq 'HASH' ) {
 			$value = $config_params->{$name};
 		} elsif ( ref($config_params) eq 'ARRAY' ) {
@@ -132,30 +151,38 @@
 			$default->{$name} = $config_params->[0]->{$name};
 		} elsif ( $attr->has_type_constraint && $attr->type_constraint->can('values') ) {
 				$value_html = select_values( $name, $attr_type, $attr->type_constraint->values );
-		} elsif ( $attr_type !~ m{^(Str|Int)$} ) {
+		} elsif ( $attr_type =~ m{^Bool} ) {
+				my $suffix = '';
+				$suffix = ' checked' if $value;
+				$value_html = qq|<input type="checkbox" name="$name" title="$attr_type" value="$value"$suffix>|;
+				push @checkboxes, $name;
+		} elsif ( $attr_type !~ m{^(Str|Int)$} || $value =~ $Frey::Web::re_html ) {
 				$value_html = qq|<textarea name="$name" title="$attr_type">$value</textarea>|;
 		}
 		
-		$value = $attr->default( $name ) if ! $value && $attr->has_default;
 		$label_title = qq| title="| . $attr->documentation . qq|"| if $attr->has_documentation;
 
 		$default->{$name} = $value unless defined $default->{$name};
 
-		if ( ! $value_html ) {
-			my $suffix = '';
-			if ( $attr_type =~ m{^Bool$} ) {
-				$type = 'checkbox';
-				$suffix = ' checked' if $value;
-			}
-			$value_html = qq|<input type="$type" name="$name" title="$attr_type" value="$value"$suffix>|;
-		}
+		$value_html = qq|<input type="$type" name="$name" title="$attr_type" value="$value">| unless $value_html;
 
 #		warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 );
 		$form .= qq|<label for="$name"$label_title>$label</label>| . $value_html;
 	}
-	my $html = qq|<h1>$class params</h1><form method="post">$form<input type="submit" value="Run $class"></form>|;
+	$form .= qq|<input type="hidden" name="frey-checkboxes" value="| . join(' ', @checkboxes) . qq|">| if @checkboxes;
+
+	my $html;
+
+	$html = qq|
+		<h1>$class params</h1>
+		<form method="post">
+		$form
+		<input type="submit" value="Run $class">
+		</form>
+	| if $form;
+
 	$self->add_status({
-		$self->editor( $self->class ) => {
+		$self->class => {
 			params  => $self->params,
 			config_params  => $config_params,
 			default => $default