diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-05-03 10:07:34 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-05-03 10:07:34 +0200 |
commit | 97c8eb3c2398d0aaf06155de5e0828e4020cb5d4 (patch) | |
tree | 44504734b0e5522d8d320e1ea06236080b6ef983 /src/Wallabag/CoreBundle/Repository | |
parent | 2142c714ef997f4853b5649ab86d150e40e6f18a (diff) | |
parent | e9023a16eba20655965b658ce4dbb2229dfe2546 (diff) | |
download | wallabag-97c8eb3c2398d0aaf06155de5e0828e4020cb5d4.tar.gz wallabag-97c8eb3c2398d0aaf06155de5e0828e4020cb5d4.tar.zst wallabag-97c8eb3c2398d0aaf06155de5e0828e4020cb5d4.zip |
Merge pull request #2013 from wallabag/fix-display-all-tags
Fix tags listing
Diffstat (limited to 'src/Wallabag/CoreBundle/Repository')
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/TagRepository.php | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php index afeb985b..abf915fe 100644 --- a/src/Wallabag/CoreBundle/Repository/TagRepository.php +++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php | |||
@@ -3,42 +3,10 @@ | |||
3 | namespace Wallabag\CoreBundle\Repository; | 3 | namespace Wallabag\CoreBundle\Repository; |
4 | 4 | ||
5 | use Doctrine\ORM\EntityRepository; | 5 | use Doctrine\ORM\EntityRepository; |
6 | use Pagerfanta\Adapter\DoctrineORMAdapter; | ||
7 | use Pagerfanta\Pagerfanta; | ||
8 | 6 | ||
9 | class TagRepository extends EntityRepository | 7 | class TagRepository extends EntityRepository |
10 | { | 8 | { |
11 | /** | 9 | /** |
12 | * Return only the QueryBuilder to retrieve all tags for a given user. | ||
13 | * | ||
14 | * @param int $userId | ||
15 | * | ||
16 | * @return QueryBuilder | ||
17 | */ | ||
18 | private function getQbForAllTags($userId) | ||
19 | { | ||
20 | return $this->createQueryBuilder('t') | ||
21 | ->leftJoin('t.entries', 'e') | ||
22 | ->where('e.user = :userId')->setParameter('userId', $userId); | ||
23 | } | ||
24 | |||
25 | /** | ||
26 | * Find Tags and return a Pager. | ||
27 | * | ||
28 | * @param int $userId | ||
29 | * | ||
30 | * @return Pagerfanta | ||
31 | */ | ||
32 | public function findTags($userId) | ||
33 | { | ||
34 | $qb = $this->getQbForAllTags($userId); | ||
35 | |||
36 | $pagerAdapter = new DoctrineORMAdapter($qb); | ||
37 | |||
38 | return new Pagerfanta($pagerAdapter); | ||
39 | } | ||
40 | |||
41 | /** | ||
42 | * Find Tags. | 10 | * Find Tags. |
43 | * | 11 | * |
44 | * @param int $userId | 12 | * @param int $userId |
@@ -47,7 +15,9 @@ class TagRepository extends EntityRepository | |||
47 | */ | 15 | */ |
48 | public function findAllTags($userId) | 16 | public function findAllTags($userId) |
49 | { | 17 | { |
50 | return $this->getQbForAllTags($userId) | 18 | return $this->createQueryBuilder('t') |
19 | ->leftJoin('t.entries', 'e') | ||
20 | ->where('e.user = :userId')->setParameter('userId', $userId) | ||
51 | ->getQuery() | 21 | ->getQuery() |
52 | ->getResult(); | 22 | ->getResult(); |
53 | } | 23 | } |