From: Nicolas LÅ“uillet Date: Tue, 13 Dec 2016 19:12:21 +0000 (+0100) Subject: Removed outputWalkers for pagination X-Git-Tag: 2.2.0~3^2~24^2~1 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9deac0c597d10283ac720a57484a78ff960fc138;hp=24becc9717423748e6ef06c6cf1c499435af66b9;p=github%2Fwallabag%2Fwallabag.git Removed outputWalkers for pagination Due to overload, we disabled output walkers (see https://github.com/whiteoctober/Pagerfanta/issues/115 --- diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index ff6f564e..b03f49ed 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -319,7 +319,7 @@ class EntryController extends Controller $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb); } - $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); + $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false); $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries') ->prepare($pagerAdapter, $page); diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 553ad6ab..c37a52c9 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php @@ -125,9 +125,7 @@ class EntryRepository extends EntityRepository { return $this ->getBuilderByUser($userId) - ->leftJoin('e.tags', 't') - ->groupBy('e.id') - ->having('count(t.id) = 0'); + ->andWhere('size(e.tags) = 0'); } /**