oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.3

Browse source
This commit is contained in:
Jeremy Benoist 2017-05-09 13:55:31 +02:00
commit 54c2d164a3
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
13 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Wallabag/ApiBundle/Controller/EntryRestController.php
View file

@ -95,12 +95,13 @@ class EntryRestController extends WallabagRestController
$tags = $request->query->get('tags', '');
$since = $request->query->get('since', 0);
/** @var \Pagerfanta\Pagerfanta $pager */
$pager = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags);
$pager->setCurrentPage($page);
$pager->setMaxPerPage($perPage);
$pager->setCurrentPage($page);
$pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
$paginatedCollection = $pagerfantaFactory->createRepresentation(