mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-04-25 19:34:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1048 from wallabag/v2-sort-entries

Browse source 
sort entries in repository
This commit is contained in:
Jeremy 2015-02-05 19:06:48 +01:00
commit de00c9208d
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Wallabag/CoreBundle/Repository/EntriesRepository.php
View file

@ -26,6 +26,7 @@ class EntriesRepository extends EntityRepository
->where('e.isRead = 0') ->where('e.isRead = 0')
->andWhere('e.userId =:userId')->setParameter('userId', $userId) ->andWhere('e.userId =:userId')->setParameter('userId', $userId)
->andWhere('e.isDeleted=0') ->andWhere('e.isDeleted=0')
->orderBy('e.createdAt', 'desc')
->getQuery(); ->getQuery();
$paginator = new Paginator($qb); $paginator = new Paginator($qb);
@ -50,6 +51,7 @@ class EntriesRepository extends EntityRepository
->where('e.isRead = 1') ->where('e.isRead = 1')
->andWhere('e.userId =:userId')->setParameter('userId', $userId) ->andWhere('e.userId =:userId')->setParameter('userId', $userId)
->andWhere('e.isDeleted=0') ->andWhere('e.isDeleted=0')
->orderBy('e.createdAt', 'desc')
->getQuery(); ->getQuery();
$paginator = new Paginator($qb); $paginator = new Paginator($qb);
@ -74,6 +76,7 @@ class EntriesRepository extends EntityRepository
->where('e.isFav = 1') ->where('e.isFav = 1')
->andWhere('e.userId =:userId')->setParameter('userId', $userId) ->andWhere('e.userId =:userId')->setParameter('userId', $userId)
->andWhere('e.isDeleted=0') ->andWhere('e.isDeleted=0')
->orderBy('e.createdAt', 'desc')
->getQuery(); ->getQuery();
$paginator = new Paginator($qb); $paginator = new Paginator($qb);
@ -83,7 +86,6 @@ class EntriesRepository extends EntityRepository
public function findEntries($userId, $isArchived, $isStarred, $isDeleted, $sort, $order) public function findEntries($userId, $isArchived, $isStarred, $isDeleted, $sort, $order)
{ {
//TODO tous les paramètres ne sont pas utilisés, à corriger
$qb = $this->createQueryBuilder('e') $qb = $this->createQueryBuilder('e')
->select('e') ->select('e')
->where('e.userId =:userId')->setParameter('userId', $userId); ->where('e.userId =:userId')->setParameter('userId', $userId);
@ -100,6 +102,12 @@ class EntriesRepository extends EntityRepository
$qb->andWhere('e.isDeleted =:isDeleted')->setParameter('isDeleted', $isDeleted); $qb->andWhere('e.isDeleted =:isDeleted')->setParameter('isDeleted', $isDeleted);
} }
if ('created' === $sort) {
$qb->orderBy('e.createdAt', $order);
} elseif ('updated' === $sort) {
$qb->orderBy('e.updatedAt', $order);
}
return $qb return $qb
->getQuery() ->getQuery()
->getResult(Query::HYDRATE_ARRAY); ->getResult(Query::HYDRATE_ARRAY);