pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Adds pagerfanta paginator everywhere, modifies article routing. Change API for is_starred and is_archived

Browse Source
This commit is contained in:
Francois Gravelaine
2015-07-27 23:20:32 +02:00
parent 9b9b05008a
commit 9fb6ac830f
8 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Wallabag/CoreBundle/Controller/EntryController.php
View File

@ -89,60 +89,72 @@ class EntryController extends Controller
/**
* Shows unread entries for current user.
*
* @Route("/unread", name="unread")
* @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"})
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function showUnreadAction()
public function showUnreadAction($page)
{
// TODO change pagination
$entries = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findUnreadByUser($this->getUser()->getId(), 0);
->findUnreadByUser($this->getUser()->getId());
$entries->setCurrentPage($page);
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array('entries' => $entries)
array(
'entries' => $entries,
'currentPage' => $page
)
);
}
/**
* Shows read entries for current user.
*
* @Route("/archive", name="archive")
* @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"})
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function showArchiveAction()
public function showArchiveAction($page)
{
// TODO change pagination
$entries = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findArchiveByUser($this->getUser()->getId(), 0);
->findArchiveByUser($this->getUser()->getId());
$entries->setCurrentPage($page);
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array('entries' => $entries)
array(
'entries' => $entries,
'currentPage' => $page
)
);
}
/**
* Shows starred entries for current user.
*
* @Route("/starred", name="starred")
* @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"})
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function showStarredAction()
public function showStarredAction($page)
{
// TODO change pagination
$entries = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findStarredByUser($this->getUser()->getId(), 0);
->findStarredByUser($this->getUser()->getId());
$entries->setCurrentPage($page);
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array('entries' => $entries)
array(
'entries' => $entries,
'currentPage' => $page
)
);
}

21
src/Wallabag/CoreBundle/Controller/RssController.php
View File

@ -23,11 +23,12 @@ class RssController extends Controller
$entries = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findUnreadByUser(
$user->getId(),
0,
$user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit')
$user->getId()
);
$perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit');
$entries->setMaxPerPage($perPage);
return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array(
'type' => 'unread',
'entries' => $entries,
@ -47,11 +48,12 @@ class RssController extends Controller
$entries = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findArchiveByUser(
$user->getId(),
0,
$user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit')
$user->getId()
);
$perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit');
$entries->setMaxPerPage($perPage);
return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array(
'type' => 'archive',
'entries' => $entries,
@ -71,11 +73,12 @@ class RssController extends Controller
$entries = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findStarredByUser(
$user->getId(),
0,
$user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit')
$user->getId()
);
$perPage = $user->getConfig()->getRssLimit() ?: $this->container->getParameter('rss_limit');
$entries->setMaxPerPage($perPage);
return $this->render('WallabagCoreBundle:Entry:entries.xml.twig', array(
'type' => 'starred',
'entries' => $entries,