--- trunk/lib/Frey/Action.pm 2009/06/04 19:23:32 1078 +++ trunk/lib/Frey/Action.pm 2009/06/04 20:30:24 1079 @@ -142,10 +142,14 @@ my $max_value_len = 0; my @values; + my $display; my $html = ''; foreach ( @$values ) { my $v = ref($_) eq 'HASH' ? $_->{$name} : $_; + if ( $v =~ s/\t+(.+)$// ) { + $display->{$v} = $1; + } warn "## value '$v'"; push @values, $v; $max_value_len = length($v) if length($v) > $max_value_len; @@ -158,7 +162,8 @@ if ( $#values > 3 && $render !~ m{radio} ) { my $options = join("\n", map { - qq||; + my $d = $display->{$_} || $_; + qq||; } @values ); # onchange="alert(this.options[this.selectedIndex].value);" @@ -205,6 +210,7 @@ my $label_width = 1; # minimum + foreach my $name ( grep { die "$_ doesn't have meta" unless $class->can('meta'); @@ -234,6 +240,12 @@ $default->{$name} = $params_config->[0]->{$name}; } elsif ( $attr->has_type_constraint && $attr->type_constraint->can('values') ) { $value_html = select_values( $name, $attr_type, $attr->type_constraint->values ); + } elsif ( $class->can( $name . '_available' ) ) { + my $available = eval $class . '->' . $name . '_available'; + confess $@ if $@; + $available =~ s/^\s+//gs; + $available =~ s/\s+$//gs; + $value_html = select_values( $name, $attr_type, [ split(/\n/,$available) ]); } elsif ( $attr_type =~ m{^Bool} ) { my $suffix = ''; $suffix = ' checked=1' if $value;