diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-07-29 09:02:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-07-29 09:02:30 +0200 |
| commit | 7e63b892f9682e62f6758bb51c6912499f5bd8d1 (patch) | |
| tree | b0b1da23086cba171d134946092f43cd31cd1e62 /src/Wallabag/CoreBundle/Controller/RssController.php | |
| parent | 9b9b05008a96a45bbf6da4c0c1c1b1244b83c6af (diff) | |
| parent | 9fb6ac830fa669beef1dd11070421262c073192c (diff) | |
| download | wallabag-7e63b892f9682e62f6758bb51c6912499f5bd8d1.tar.gz wallabag-7e63b892f9682e62f6758bb51c6912499f5bd8d1.tar.zst wallabag-7e63b892f9682e62f6758bb51c6912499f5bd8d1.zip | |
Merge pull request #1250 from frankoa/v2_pagination_and_api
Adds pagerfanta paginator everywhere, modifies article routing.
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/RssController.php')
| -rw-r--r-- | src/Wallabag/CoreBundle/Controller/RssController.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index 86754e15..8428dce0 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php | |||
| @@ -23,11 +23,12 @@ class RssController extends Controller | |||
| 23 | $entries = $this->getDoctrine() | 23 | $entries = $this->getDoctrine() |
| 24 | ->getRepository('WallabagCoreBundle:Entry') | 24 | ->getRepository('WallabagCoreBundle:Entry') |
| 25 | ->findUnreadByUser( | 25 | ->findUnreadByUser( |
| 26 | $user->getId(), | 26 | $user->getId() |
| 27 | 0, | ||
| 28 | $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit') | ||
| 29 | ); | 27 | ); |
| 30 | 28 | ||
| 29 | $perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit'); | ||
| 30 | $entries->setMaxPerPage($perPage); | ||
| 31 | |||
| 31 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( | 32 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( |
| 32 | 'type' => 'unread', | 33 | 'type' => 'unread', |
| 33 | 'entries' => $entries, | 34 | 'entries' => $entries, |
| @@ -47,11 +48,12 @@ class RssController extends Controller | |||
| 47 | $entries = $this->getDoctrine() | 48 | $entries = $this->getDoctrine() |
| 48 | ->getRepository('WallabagCoreBundle:Entry') | 49 | ->getRepository('WallabagCoreBundle:Entry') |
| 49 | ->findArchiveByUser( | 50 | ->findArchiveByUser( |
| 50 | $user->getId(), | 51 | $user->getId() |
| 51 | 0, | ||
| 52 | $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit') | ||
| 53 | ); | 52 | ); |
| 54 | 53 | ||
| 54 | $perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit'); | ||
| 55 | $entries->setMaxPerPage($perPage); | ||
| 56 | |||
| 55 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( | 57 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( |
| 56 | 'type' => 'archive', | 58 | 'type' => 'archive', |
| 57 | 'entries' => $entries, | 59 | 'entries' => $entries, |
| @@ -71,11 +73,12 @@ class RssController extends Controller | |||
| 71 | $entries = $this->getDoctrine() | 73 | $entries = $this->getDoctrine() |
| 72 | ->getRepository('WallabagCoreBundle:Entry') | 74 | ->getRepository('WallabagCoreBundle:Entry') |
| 73 | ->findStarredByUser( | 75 | ->findStarredByUser( |
| 74 | $user->getId(), | 76 | $user->getId() |
| 75 | 0, | ||
| 76 | $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit') | ||
| 77 | ); | 77 | ); |
| 78 | 78 | ||
| 79 | $perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit'); | ||
| 80 | $entries->setMaxPerPage($perPage); | ||
| 81 | |||
| 79 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( | 82 | return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array( |
| 80 | 'type' => 'starred', | 83 | 'type' => 'starred', |
| 81 | 'entries' => $entries, | 84 | 'entries' => $entries, |