--- trunk/lib/Frey/Action.pm	2008/11/25 01:00:16	509
+++ trunk/lib/Frey/Action.pm	2008/11/30 15:13:32	640
@@ -125,6 +125,8 @@
 		my $attr = $class->meta->get_attribute( $name );
 		$attr_type = $attr->type_constraint->name if $attr->has_type_constraint;
 
+		$value = $attr->default( $name ) if ! $value && $attr->has_default;
+
 		if ( ref($config_params) eq 'HASH' ) {
 			$value = $config_params->{$name};
 		} elsif ( ref($config_params) eq 'ARRAY' ) {
@@ -132,30 +134,26 @@
 			$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{^Bool} ) {
+				my $suffix = '';
+				$suffix = ' checked' if $value;
+				$value_html = qq|<input type="checkbox" name="$name" title="$attr_type" value="$value"$suffix>|;
 		} elsif ( $attr_type !~ m{^(Str|Int)$} ) {
 				$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>|;
 	$self->add_status({
-		$self->editor( $self->class ) => {
+		$self->class => {
 			params  => $self->params,
 			config_params  => $config_params,
 			default => $default