Add pagination

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2017-04-27 16:23:54 +02:00 committed by Nicolas Lœuillet
parent c37515f880
commit 50cfd8108b
3 changed files with 45 additions and 12 deletions

View file

@ -4,12 +4,14 @@ namespace Wallabag\UserBundle\Controller;
use FOS\UserBundle\Event\UserEvent; use FOS\UserBundle\Event\UserEvent;
use FOS\UserBundle\FOSUserEvents; use FOS\UserBundle\FOSUserEvents;
use Pagerfanta\Adapter\DoctrineORMAdapter;
use Pagerfanta\Exception\OutOfRangeCurrentPageException;
use Pagerfanta\Pagerfanta;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Wallabag\UserBundle\Entity\User; use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\UserBundle\Form\SearchUserType; use Wallabag\UserBundle\Form\SearchUserType;
/** /**
@ -20,17 +22,32 @@ class ManageController extends Controller
/** /**
* Lists all User entities. * Lists all User entities.
* *
* @Route("/", name="user_index") * @Route("/index/{page}", name="user_index")
* @Method("GET") * @Method("GET")
*
* @param int $page
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/ */
public function indexAction() public function indexAction($page = 1)
{ {
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
$users = $em->getRepository('WallabagUserBundle:User')->findAll(); $qb = $em->getRepository('WallabagUserBundle:User')->createQueryBuilder('u');
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
$pagerFanta = new Pagerfanta($pagerAdapter);
$pagerFanta->setMaxPerPage(50);
try {
$pagerFanta->setCurrentPage($page);
} catch (OutOfRangeCurrentPageException $e) {
if ($page > 1) {
return $this->redirect($this->generateUrl('user_index', ['page' => $pagerFanta->getNbPages()]), 302);
}
}
return $this->render('WallabagUserBundle:Manage:index.html.twig', array( return $this->render('WallabagUserBundle:Manage:index.html.twig', array(
'users' => $users, 'users' => $pagerFanta,
)); ));
} }
@ -176,10 +193,22 @@ class ManageController extends Controller
$searchTerm = (isset($request->get('search_user')['term']) ? $request->get('search_user')['term'] : ''); $searchTerm = (isset($request->get('search_user')['term']) ? $request->get('search_user')['term'] : '');
$users = $em->getRepository('WallabagUserBundle:User')->getUsersForSearch($searchTerm); $qb = $em->getRepository('WallabagUserBundle:User')->getQueryBuilderForSearch($searchTerm);
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
$pagerFanta = new Pagerfanta($pagerAdapter);
$pagerFanta->setMaxPerPage(50);
try {
$pagerFanta->setCurrentPage($page);
} catch (OutOfRangeCurrentPageException $e) {
if ($page > 1) {
return $this->redirect($this->generateUrl('user_index', ['page' => $pagerFanta->getNbPages()]), 302);
}
}
return $this->render('WallabagUserBundle:Manage:index.html.twig', array( return $this->render('WallabagUserBundle:Manage:index.html.twig', array(
'users' => $users, 'users' => $pagerFanta,
)); ));
} }

View file

@ -60,11 +60,9 @@ class UserRepository extends EntityRepository
* *
* @return QueryBuilder * @return QueryBuilder
*/ */
public function getUsersForSearch($term) public function getQueryBuilderForSearch($term)
{ {
return $this->createQueryBuilder('u') return $this->createQueryBuilder('u')
->andWhere('lower(u.username) LIKE lower(:term) OR lower(u.email) LIKE lower(:term) OR lower(u.name) LIKE lower(:term)')->setParameter('term', '%'.$term.'%') ->andWhere('lower(u.username) LIKE lower(:term) OR lower(u.email) LIKE lower(:term) OR lower(u.name) LIKE lower(:term)')->setParameter('term', '%'.$term.'%');
->getQuery()
->getResult();
} }
} }

View file

@ -7,6 +7,9 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel"> <div class="card-panel">
{% if users.getNbPages > 1 %}
{{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
{% endif %}
<div class="row"> <div class="row">
<div class="col s6"> <div class="col s6">
<p class="help">{{ 'user.description'|trans|raw }}</p> <p class="help">{{ 'user.description'|trans|raw }}</p>
@ -22,7 +25,7 @@
<tr> <tr>
<th>{{ 'user.form.username_label'|trans }}</th> <th>{{ 'user.form.username_label'|trans }}</th>
<th>{{ 'user.form.email_label'|trans }}</th> <th>{{ 'user.form.email_label'|trans }}</th>
<th>{{ 'user.form2017-03-10 16:51:07.last_login_label'|trans }}</th> <th>{{ 'user.form.last_login_label'|trans }}</th>
<th>{{ 'user.list.actions'|trans }}</th> <th>{{ 'user.list.actions'|trans }}</th>
</tr> </tr>
</thead> </thead>
@ -43,6 +46,9 @@
<p> <p>
<a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'|trans }}</a> <a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'|trans }}</a>
</p> </p>
{% if users.getNbPages > 1 %}
{{ pagerfanta(users, 'twitter_bootstrap_translated', {'proximity': 1}) }}
{% endif %}
</div> </div>
</div> </div>
</div> </div>