diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 9b2954e7..cef29990 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -532,24 +532,27 @@ class EntryController extends Controller | |||
532 | $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : ''); | 532 | $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : ''); |
533 | $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : ''); | 533 | $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : ''); |
534 | 534 | ||
535 | $sortBy = $request->get('sort', 'id'); | ||
536 | $direction = $request->get('direction', 'DESC'); | ||
537 | |||
535 | switch ($type) { | 538 | switch ($type) { |
536 | case 'search': | 539 | case 'search': |
537 | $qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm, $currentRoute); | 540 | $qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm, $currentRoute); |
538 | break; | 541 | break; |
539 | case 'untagged': | 542 | case 'untagged': |
540 | $qb = $repository->getBuilderForUntaggedByUser($this->getUser()->getId()); | 543 | $qb = $repository->getBuilderForUntaggedByUser($this->getUser()->getId(), $sortBy, $direction); |
541 | break; | 544 | break; |
542 | case 'starred': | 545 | case 'starred': |
543 | $qb = $repository->getBuilderForStarredByUser($this->getUser()->getId()); | 546 | $qb = $repository->getBuilderForStarredByUser($this->getUser()->getId(), $sortBy, $direction); |
544 | break; | 547 | break; |
545 | case 'archive': | 548 | case 'archive': |
546 | $qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId()); | 549 | $qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId(), $sortBy, $direction); |
547 | break; | 550 | break; |
548 | case 'unread': | 551 | case 'unread': |
549 | $qb = $repository->getBuilderForUnreadByUser($this->getUser()->getId()); | 552 | $qb = $repository->getBuilderForUnreadByUser($this->getUser()->getId(), $sortBy, $direction); |
550 | break; | 553 | break; |
551 | case 'all': | 554 | case 'all': |
552 | $qb = $repository->getBuilderForAllByUser($this->getUser()->getId()); | 555 | $qb = $repository->getBuilderForAllByUser($this->getUser()->getId(), $sortBy, $direction); |
553 | break; | 556 | break; |
554 | default: | 557 | default: |
555 | throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); | 558 | throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); |