}
/**
- * Shows unread entries for current user.
+ * Shows all entries for current user.
*
* @param Request $request
* @param int $page
*
- * @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"})
+ * @Route("/all/list/{page}", name="all", defaults={"page" = "1"})
*
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function showUnreadAction(Request $request, $page)
+ public function showAllAction(Request $request, $page)
{
$form = $this->get('form.factory')->create(new EntryFilterType());
$filterBuilder = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
- ->findUnreadByUser($this->getUser()->getId());
+ ->findAllByUser($this->getUser()->getId());
if ($request->query->has($form->getName())) {
// manually bind values from the request
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array(
- 'form' => $form->createView(),
- 'entries' => $entries,
- 'currentPage' => $page
+ 'form' => $form->createView(),
+ 'entries' => $entries,
+ 'currentPage' => $page,
)
);
}
+ /**
+ * Shows unread entries for current user.
+ *
+ * @param Request $request
+ * @param int $page
+ *
+ * @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"})
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function showUnreadAction(Request $request, $page)
+ {
+ return $this->showEntries('unread', $request, $page);
+ }
+
/**
* Shows read entries for current user.
*
*/
public function showArchiveAction(Request $request, $page)
{
- $form = $this->get('form.factory')->create(new EntryFilterType());
+ return $this->showEntries('archive', $request, $page);
+ }
- $filterBuilder = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
- ->findArchiveByUser($this->getUser()->getId());
+ /**
+ * Shows starred entries for current user.
+ *
+ * @param Request $request
+ * @param int $page
+ *
+ * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"})
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function showStarredAction(Request $request, $page)
+ {
+ return $this->showEntries('starred', $request, $page);
+ }
+
+ /**
+ * Global method to retrieve entries depending on the given type
+ * It returns the response to be send.
+ *
+ * @param string $type Entries type: unread, starred or archive
+ * @param Request $request
+ * @param int $page
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ private function showEntries($type, Request $request, $page)
+ {
+ $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
+
+ switch ($type) {
+ case 'starred':
+ $qb = $repository->getBuilderForStarredByUser($this->getUser()->getId());
+ break;
+
+ case 'archive':
+ $qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId());
+ break;
+
+ case 'unread':
+ $qb = $repository->getBuilderForUnreadByUser($this->getUser()->getId());
+ break;
+
+ default:
+ throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
+ }
+
+ $form = $this->get('form.factory')->create(new EntryFilterType());
if ($request->query->has($form->getName())) {
// manually bind values from the request
$form->submit($request->query->get($form->getName()));
// build the query from the given form object
- $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $filterBuilder);
+ $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb);
}
- $pagerAdapter = new DoctrineORMAdapter($filterBuilder->getQuery());
+ $pagerAdapter = new DoctrineORMAdapter($qb->getQuery());
$entries = new Pagerfanta($pagerAdapter);
$entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array(
- 'form' => $form->createView(),
- 'entries' => $entries,
- 'currentPage' => $page
+ 'form' => $form->createView(),
+ 'entries' => $entries,
+ 'currentPage' => $page,
)
);
- }
-
- /**
- * Shows starred entries for current user.
- *
- * @param Request $request
- * @param int $page
- *
- * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"})
- *
- * @return \Symfony\Component\HttpFoundation\Response
- */
- public function showStarredAction(Request $request, $page)
- {
- $form = $this->get('form.factory')->create(new EntryFilterType());
-
- $filterBuilder = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
- ->findStarredByUser($this->getUser()->getId());
if ($request->query->has($form->getName())) {
// manually bind values from the request
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
array(
- 'form' => $form->createView(),
- 'entries' => $entries,
- 'currentPage' => $page
+ 'form' => $form->createView(),
+ 'entries' => $entries,
+ 'currentPage' => $page,
)
);
}
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry ' . ($entry->isArchived() ? 'archived' : 'unarchived')
+ 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived')
);
return $this->redirect($request->headers->get('referer'));
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry ' . ($entry->isStarred() ? 'starred' : 'unstarred')
+ 'Entry '.($entry->isStarred() ? 'starred' : 'unstarred')
);
return $this->redirect($request->headers->get('referer'));