oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-17 17:08:37 +00:00
Code Wiki Activity

for GET /api/entries, star, delete and archive status are no more necessary

Browse source
This commit is contained in:
Nicolas Lœuillet 2015-02-04 18:06:42 +01:00
parent 42a9064620
commit 6e334aba68
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Wallabag/CoreBundle/Controller/StaticController.php
View file

@ -18,7 +18,6 @@ class StaticController extends Controller
); );
} }
/** /**
* @Route("/", name="homepage") * @Route("/", name="homepage")
*/ */

8
src/Wallabag/CoreBundle/Controller/WallabagRestController.php
View file

@ -33,9 +33,9 @@ class WallabagRestController extends Controller
{ {
// TODO isArchived, isStarred et isDeleted ne doivent pas avoir de valeur par défaut // TODO isArchived, isStarred et isDeleted ne doivent pas avoir de valeur par défaut
// TODO Si on ne passe rien, on ne filtre pas sur le statut. // TODO Si on ne passe rien, on ne filtre pas sur le statut.
$isArchived = $request->query->get('archive', 0); $isArchived = $request->query->get('archive');
$isStarred = $request->query->get('star', 0); $isStarred = $request->query->get('star');
$isDeleted = $request->query->get('delete', 0); $isDeleted = $request->query->get('delete');
$sort = $request->query->get('sort', 'created'); $sort = $request->query->get('sort', 'created');
$order = $request->query->get('order', 'desc'); $order = $request->query->get('order', 'desc');
$page = $request->query->get('page', 1); $page = $request->query->get('page', 1);
@ -45,7 +45,7 @@ class WallabagRestController extends Controller
$entries = $this $entries = $this
->getDoctrine() ->getDoctrine()
->getRepository('WallabagCoreBundle:Entries') ->getRepository('WallabagCoreBundle:Entries')
->findEntries(1, (int) $isArchived, (int) $isStarred, (int) $isDeleted, $sort, $order); ->findEntries(1, $isArchived, $isStarred, $isDeleted, $sort, $order);
if (!is_array($entries)) { if (!is_array($entries)) {
throw $this->createNotFoundException(); throw $this->createNotFoundException();

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

@ -86,13 +86,19 @@ class EntriesRepository extends EntityRepository
//TODO tous les paramètres ne sont pas utilisés, à corriger //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.isFav =:isStarred')->setParameter('isStarred', $isStarred) ->where('e.userId =:userId')->setParameter('userId', $userId)
->andWhere('e.isRead =:isArchived')->setParameter('isArchived', $isArchived) ->andWhere('e.isDeleted=0');
->andWhere('e.userId =:userId')->setParameter('userId', $userId)
->andWhere('e.isDeleted=0') if (!is_null($isArchived)) {
$qb->andWhere('e.isRead =:isArchived')->setParameter('isArchived', $isArchived);
}
if (!is_null($isStarred)) {
$qb->andWhere('e.isFav =:isStarred')->setParameter('isStarred', $isStarred);
}
return $qb
->getQuery() ->getQuery()
->getResult(Query::HYDRATE_ARRAY); ->getResult(Query::HYDRATE_ARRAY);
return $qb;
} }
} }