--- trunk/lib/Frey/ObjectBrowser.pm 2008/07/11 12:47:50 96 +++ trunk/lib/Frey/ObjectBrowser.pm 2008/07/13 13:09:56 109 @@ -1,8 +1,14 @@ package Frey::ObjectBrowser; use Moose; -use MooseX::Method; extends 'Frey'; +with 'Frey::Web'; + +has 'fey_class' => ( + is => 'rw', + isa => 'Str', + required => 1, +); my @callbacks; @@ -24,38 +30,19 @@ #use Data::Dumper; #$Data::Dumper::Deparse = 1; use Data::Dump qw/dump/; -use Data::Structure::Util qw(unbless); +use Frey::Web::Row; -#method 'html' => positional( -# isa => 'Continuity::RequestHolder', -# required => 1, -#) => sub { sub html { my ( $self, $req ) = @_; my $f = { $req->params }; my $layout = delete( $f->{layout} ) || 'div'; - use Strix::User; - use Strix::View::User; - - my $s = Strix::User->rows(); - #warn "# s = ",dump( $s ); - my @w; - while ( my $u = $s->next ) { - my $w = Strix::View::User->new( %{ $u } ); - $w->_fey( $u ); - $w->_layout( $layout ); - warn "# w = ",dump( $w ) if $self->debug; - push @w, $w; - } - while ( 1 ) { - warn "# got $#w elements: ",dump( map { $_->id } @w ); warn "<<< GOT REQUEST ",dump( $f ); # re-apply (changed?) layout to elements @@ -64,18 +51,32 @@ warn "# new layout = $layout\n"; } + if ( ! @w || $f->{limit} || $f->{offset} ) { + my $s = $self->fey_class->collection( $f ); + warn "# s ",$self->fey_class," = ",dump( $s ) if $self->debug; + + @w = (); + + while ( my $u = $s->next ) { + my $w = Frey::Web::Row->new( fey_class => $self->fey_class, fey => $u, layout => $layout ); + warn "# w = ",dump( $w ) if $self->debug; + push @w, $w; + } + + warn "# got $#w elements: ",dump( map { $_->id } @w ); + } + my $rows_delimiter = ''; $rows_delimiter = '