aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-12-13 20:12:21 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-12-15 22:22:56 +0100
commit9deac0c597d10283ac720a57484a78ff960fc138 (patch)
tree99a12b8fe5716269562d73503a6145b1822f454d
parent24becc9717423748e6ef06c6cf1c499435af66b9 (diff)
downloadwallabag-9deac0c597d10283ac720a57484a78ff960fc138.tar.gz
wallabag-9deac0c597d10283ac720a57484a78ff960fc138.tar.zst
wallabag-9deac0c597d10283ac720a57484a78ff960fc138.zip
Removed outputWalkers for pagination
Due to overload, we disabled output walkers (see https://github.com/whiteoctober/Pagerfanta/issues/115
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php2
-rw-r--r--src/Wallabag/CoreBundle/Repository/EntryRepository.php4
2 files changed, 2 insertions, 4 deletions
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
319 $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb); 319 $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb);
320 } 320 }
321 321
322 $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); 322 $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
323 323
324 $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries') 324 $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
325 ->prepare($pagerAdapter, $page); 325 ->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
125 { 125 {
126 return $this 126 return $this
127 ->getBuilderByUser($userId) 127 ->getBuilderByUser($userId)
128 ->leftJoin('e.tags', 't') 128 ->andWhere('size(e.tags) = 0');
129 ->groupBy('e.id')
130 ->having('count(t.id) = 0');
131 } 129 }
132 130
133 /** 131 /**