namespace Wallabag\CoreBundle\Controller;
use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Exception\OutOfRangeCurrentPageException;
use Pagerfanta\Pagerfanta;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Filter\EntryFilterType;
+use Wallabag\CoreBundle\Form\Type\EntryFilterType;
use Wallabag\CoreBundle\Form\Type\EditEntryType;
use Wallabag\CoreBundle\Form\Type\NewEntryType;
if ($form->isValid()) {
// check for existing entry, if it exists, redirect to it with a message
- $existingEntry = $this->get('wallabag_core.entry_repository')
- ->existByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+ $existingEntry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
if (false !== $existingEntry) {
$this->get('session')->getFlashBag()->add(
'notice',
- 'Entry already saved on '.$existingEntry['createdAt']->format('d-m-Y')
+ 'Entry already saved on '.$existingEntry->getCreatedAt()->format('d-m-Y')
);
- return $this->redirect($this->generateUrl('view', array('id' => $existingEntry['id'])));
+ return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId())));
}
$this->updateEntry($entry);
*
* @return \Symfony\Component\HttpFoundation\Response
*/
- public function addEntryViaBookmarklet(Request $request)
+ public function addEntryViaBookmarkletAction(Request $request)
{
$entry = new Entry($this->getUser());
$entry->setUrl($request->get('url'));
*/
public function showUnreadAction(Request $request, $page)
{
+ // load the quickstart if no entry in database
+ if ($page == 1 && $this->get('wallabag_core.entry_repository')->countAllEntriesByUsername($this->getUser()->getId()) == 0) {
+ return $this->redirect($this->generateUrl('quickstart'));
+ }
+
return $this->showEntries('unread', $request, $page);
}
*/
private function showEntries($type, Request $request, $page)
{
- $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry');
+ $repository = $this->get('wallabag_core.entry_repository');
switch ($type) {
case 'starred':
throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
}
- $form = $this->createForm(new EntryFilterType($repository, $this->getUser()));
+ $form = $this->createForm(EntryFilterType::class);
if ($request->query->has($form->getName())) {
// manually bind values from the request
$entries = new Pagerfanta($pagerAdapter);
$entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
- $entries->setCurrentPage($page);
+ try {
+ $entries->setCurrentPage($page);
+ } catch (OutOfRangeCurrentPageException $e) {
+ if ($page > 1) {
+ return $this->redirect($this->generateUrl($type, array('page' => $entries->getNbPages())), 302);
+ }
+ }
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',