mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-20 06:36:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2701 from wallabag/disable-outputWalkers

Browse source 
Removed outputWalkers for pagination
This commit is contained in:
Nicolas Lœuillet 2016-12-16 07:43:01 +01:00 committed by GitHub
commit be8033bf12
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/EntryController.php
View file

@ -319,7 +319,7 @@ class EntryController extends Controller
$this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb); $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') $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
->prepare($pagerAdapter, $page); ->prepare($pagerAdapter, $page);

2
src/Wallabag/CoreBundle/Controller/RssController.php
View file

@ -85,7 +85,7 @@ class RssController extends Controller
throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
} }
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
$entries = new Pagerfanta($pagerAdapter); $entries = new Pagerfanta($pagerAdapter);
$perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit'); $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit');

6
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View file

@ -125,9 +125,7 @@ class EntryRepository extends EntityRepository
{ {
return $this return $this
->getBuilderByUser($userId) ->getBuilderByUser($userId)
->leftJoin('e.tags', 't') ->andWhere('size(e.tags) = 0');
->groupBy('e.id')
->having('count(t.id) = 0');
} }
/** /**
@ -173,7 +171,7 @@ class EntryRepository extends EntityRepository
$qb->orderBy('e.updatedAt', $order); $qb->orderBy('e.updatedAt', $order);
} }
$pagerAdapter = new DoctrineORMAdapter($qb); $pagerAdapter = new DoctrineORMAdapter($qb, true, false);
return new Pagerfanta($pagerAdapter); return new Pagerfanta($pagerAdapter);
} }