]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #1385 from wallabag/v2-status-filter
authorJeremy Benoist <j0k3r@users.noreply.github.com>
Fri, 21 Aug 2015 15:49:20 +0000 (17:49 +0200)
committerJeremy Benoist <j0k3r@users.noreply.github.com>
Fri, 21 Aug 2015 15:49:20 +0000 (17:49 +0200)
filters: implement status filter and a new view (to display all entries)

1  2 
src/Wallabag/CoreBundle/Controller/EntryController.php

index b6a689633e1f89fd2671193151579bd6186d94df,c4975ae6673cd44aed00ace982e05b1cd47c2c36..b73e9eecd52e5aeb81e0c72e75fdf3a97f0c290a
@@@ -101,6 -101,21 +101,21 @@@ class EntryController extends Controlle
          ));
      }
  
+     /**
+      * Shows all entries for current user.
+      *
+      * @param Request $request
+      * @param int     $page
+      *
+      * @Route("/all/list/{page}", name="all", defaults={"page" = "1"})
+      *
+      * @return \Symfony\Component\HttpFoundation\Response
+      */
+     public function showAllAction(Request $request, $page)
+     {
+         return $this->showEntries('all', $request, $page);
+     }
      /**
       * Shows unread entries for current user.
       *
                  $qb = $repository->getBuilderForUnreadByUser($this->getUser()->getId());
                  break;
  
+             case 'all':
+                 $qb = $repository->getBuilderForAllByUser($this->getUser()->getId());
+                 break;
              default:
                  throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
          }
          return $this->render(
              'WallabagCoreBundle:Entry:entries.html.twig',
              array(
 -                'form' => $form->createView(),
 -                'entries' => $entries,
 -                'currentPage' => $page,
 -            )
 -        );
 -
 -        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);
 -        }
 -
 -        $pagerAdapter = new DoctrineORMAdapter($filterBuilder->getQuery());
 -        $entries = new Pagerfanta($pagerAdapter);
 -
 -        $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
 -        $entries->setCurrentPage($page);
 -
 -        return $this->render(
 -            'WallabagCoreBundle:Entry:entries.html.twig',
 -            array(
                  'form' => $form->createView(),
                  'entries' => $entries,
                  'currentPage' => $page,