--- trunk/lib/Frey/ObjectBrowser.pm 2008/07/10 10:28:11 78 +++ trunk/lib/Frey/ObjectBrowser.pm 2008/07/13 16:17:34 111 @@ -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,53 +30,107 @@ #use Data::Dumper; #$Data::Dumper::Deparse = 1; use Data::Dump qw/dump/; -use Data::Structure::Util qw(unbless); +use Frey::Web::Row; +use Frey::Web::Links; -#method 'html' => positional( -# isa => 'Continuity::RequestHolder', -# required => 1, -#) => sub { sub html { my ( $self, $req ) = @_; - my $params = $req->param; - warn "# params = ",dump( $params ); - - use Strix::User; - use Strix::View::User; - - my $s = Strix::User->rows(); - warn "# s = ",dump( $s ); + my $f = { $req->params }; + my $layout = delete( $f->{layout} ) || 'div'; - my $f = {}; my @w; - - while ( my $u = $s->next ) { - warn "# u = ",dump( $u ); - my $w = Strix::View::User->new( - #%{ unbless( $u ) }, # FIXME this is cludge - %{ $u } # much better :-) - ); - $w->_fey( $u ); - warn "# w = ",dump( $w ); - push @w, $w; - } - - push @w, Strix::View::User->new( render_as => 'edit' ); + my $pager; while ( 1 ) { - warn "# got $#w elements\n"; + warn "<<< GOT REQUEST ",dump( $f ); + + # re-apply (changed?) layout to elements + if ( defined $f->{layout} ) { + $layout = delete( $f->{layout} ); + warn "# new layout = $layout\n"; + } + + if ( ! @w || $f->{page} || $f->{per_page} ) { + my $s; + ( $s, $pager ) = $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 ), " from total of ", $s->handle->rows; + } + + my $rows_delimiter = ''; + $rows_delimiter = '