--- trunk/lib/Frey/Action.pm 2008/11/17 22:40:22 386 +++ trunk/lib/Frey/Action.pm 2008/11/20 10:50:28 469 @@ -38,11 +38,13 @@ $self->load_class( $self->class ); my @required = grep { - defined $_ && $_->can('name') && !defined( $self->params->{ $_->name } ) + defined $_ && $_->can('name') && + ! defined( $self->params->{ $_->name } ) && + ! $_->is_lazy } map { my $attr = $self->class->meta->get_attribute($_); - $attr->is_required && $attr; + blessed $attr && $attr->is_required && $attr; } $self->class->meta->get_attribute_list; warn "## required = ",dump( map { $_->name } @required ), " for ", $self->class if @required && $self->debug; @@ -82,11 +84,11 @@ my ( $self ) = @_; my @required = $self->required; if ( ! @required ) { - warn "all params available ", dump( $self->params ), " not creating form"; + warn "all params available ", dump( $self->params ), " not creating form" if $self->debug; return (undef,$self->params) if wantarray; return; } else { - warn $self->class, " required params ", dump( @required ) if $self->debug; + warn $self->class, " required params ", map { $_->dump(2) } @required if $self->debug; } my $class = $self->class; @@ -102,7 +104,7 @@ my $form; foreach my $name ( grep { ! $class->meta->get_attribute($_)->is_lazy } $self->attributes ) { - my $attr_type; + my $attr_type = ''; my $type = $name =~ m/^pass/ ? 'password' : 'text'; my $label = $name; my $value = ''; @@ -119,8 +121,8 @@ ) . qq||; $default->{$name} = $config_params->[0]->{$name}; } elsif ( my $attr = $class->meta->get_attribute( $name ) ) { - $attr_type = $attr->type_constraint->name; if ( $attr->has_type_constraint ) { + $attr_type = $attr->type_constraint->name; if ( $attr->type_constraint->can('values') ) { $value_html = qq|| unless $value_html; - $default->{$name} = $value unless defined $default->{$name}; + $value_html = qq|| unless $value_html; + # warn "# required $name ", $class->meta->get_attribute( $name )->dump( 2 ); $form .= qq|| . $value_html; } - my $html = join("\n", - qq|

$class params

$form
|, - qq|config| . dump( $config_params ) . qq||, - qq|default| . dump( $default ) . qq||, - ) if $form; + my $html = qq|

$class params

$form
|; + push @{ $self->status }, { + $self->class => { + params => $self->params, + config_params => $config_params, + default => $default + }, + }; return ($html,$default) if wantarray; return $html;