Changeset 48 for server/trunk
- Timestamp:
- 11/29/10 04:59:48 (14 years ago)
- Location:
- server/trunk/web
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
server/trunk/web/lib/Sophie/Controller/Search.pm
r46 r48 27 27 28 28 if ($c->req->param('page')) { 29 $c->req->params->{search} = $c->session->{search};29 $c->req->params->{search} ||= $c->session->{search}; 30 30 } 31 31 … … 35 35 my $pager = $c->stash->{rs}->pager; 36 36 $c->stash->{pager} = $pager; 37 $c->stash->{xmlrpc} = [ 38 $c->stash->{rs}->get_column('pkgid')->all 39 ]; 37 $c->stash->{xmlrpc} = { 38 results => [ $c->stash->{rs}->get_column('pkgid')->all ], 39 pages => $pager->last_page, 40 current_page => $pager->current_page, 41 total_entries => $pager->total_entries, 42 entries_per_page => $pager->entries_per_page, 43 }; 40 44 } 41 45 } … … 54 58 if (!$c->req->xmlrpc->method) { 55 59 $r->{page} = $c->req->param('page') || 1; 56 $r->{rows} = 20;60 $r->{rows} = $c->req->param('rows') || 15; 57 61 } 58 62 return $r; -
server/trunk/web/root/templates/html/search/results.tt
r43 r48 17 17 </p> 18 18 19 [% FOREACH pkgid = xmlrpc %]19 [% FOREACH pkgid = xmlrpc.results %] 20 20 [% info = c.forward('/rpms/info', [ pkgid ]) %] 21 21 <p><a href="[% c.uri_for('/rpms', pkgid) %]">[% info.name %]-[% info.version -
server/trunk/web/root/templates/includes/header.tt
r45 r48 28 28 </p> 29 29 </div> 30 <div style="clear:both"></div>31 30 <div style="float: right"> 31 Search:<br> 32 32 [% INCLUDE 'search/simple_search.tt' %] 33 33 </div>
Note: See TracChangeset
for help on using the changeset viewer.