--- trunk/lib/Frey/Action.pm 2008/11/17 15:42:12 372 +++ trunk/lib/Frey/Action.pm 2008/11/25 00:26:15 507 @@ -4,6 +4,7 @@ with 'Frey::Web'; with 'Frey::Config'; +use Clone qw/clone/; use Data::Dump qw/dump/; =head1 DESCRIPTION @@ -37,14 +38,16 @@ $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; + warn "## required = ",dump( map { $_->name } @required ), " for ", $self->class if @required && $self->debug; return @required if wantarray; return \@required; } @@ -65,14 +68,15 @@ my @attrs = @{ $self->attribute_order }; @attrs = map { $a->{$_}++; $_ } @attrs; push @attrs, $_ foreach grep { ! $a->{$_} } map { $_->name } @{ $self->required }; - warn "# attributes = ",dump( @attrs ); + warn "# attributes = ",dump( @attrs ) if $self->debug; return @attrs if wantarray; return \@attrs; } =head2 params_form - my $html = $self->params_form; + my $html = $self->params_form; + my ($html,$default_params) = $self->params_form; =cut @@ -80,62 +84,77 @@ 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 ); + warn $self->class, " required params ", map { $_->dump(2) } @required if $self->debug; } my $class = $self->class; $self->load_class( $class ); - my $params = {}; - $params = $self->config($class); - warn "# $class config = ",dump( $params ) if $self->debug; + my $default = clone $self->params; # XXX we really don't want to modify params! - my $html = qq|