diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-12-16 07:43:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-16 07:43:01 +0100 |
commit | be8033bf12b8545183870325755df0a2ffc80f8b (patch) | |
tree | bc215aede9b5eb84ca8c22b195b3be3edb90aff4 /src/Wallabag | |
parent | 24becc9717423748e6ef06c6cf1c499435af66b9 (diff) | |
parent | 5a5da36955a00a4c07100c81c443d195a4dd01a2 (diff) | |
download | wallabag-be8033bf12b8545183870325755df0a2ffc80f8b.tar.gz wallabag-be8033bf12b8545183870325755df0a2ffc80f8b.tar.zst wallabag-be8033bf12b8545183870325755df0a2ffc80f8b.zip |
Merge pull request #2701 from wallabag/disable-outputWalkers
Removed outputWalkers for pagination
Diffstat (limited to 'src/Wallabag')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/RssController.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 6 |
3 files changed, 4 insertions, 6 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/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index 2290386f..92f18707 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php | |||
@@ -85,7 +85,7 @@ class RssController extends Controller | |||
85 | throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); | 85 | throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); |
86 | } | 86 | } |
87 | 87 | ||
88 | $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); | 88 | $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false); |
89 | $entries = new Pagerfanta($pagerAdapter); | 89 | $entries = new Pagerfanta($pagerAdapter); |
90 | 90 | ||
91 | $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit'); | 91 | $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit'); |
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 553ad6ab..b9532fa2 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 | /** |
@@ -173,7 +171,7 @@ class EntryRepository extends EntityRepository | |||
173 | $qb->orderBy('e.updatedAt', $order); | 171 | $qb->orderBy('e.updatedAt', $order); |
174 | } | 172 | } |
175 | 173 | ||
176 | $pagerAdapter = new DoctrineORMAdapter($qb); | 174 | $pagerAdapter = new DoctrineORMAdapter($qb, true, false); |
177 | 175 | ||
178 | return new Pagerfanta($pagerAdapter); | 176 | return new Pagerfanta($pagerAdapter); |
179 | } | 177 | } |