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

Preselect currently active section in the filter menu

Browse source 
Fixes #2533

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf 2021-01-23 21:34:45 +01:00
parent 07e249ee57
commit 8e89b3ad76
3 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -532,6 +532,8 @@ class EntryController extends Controller
$searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
$currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
$formOptions = [];
switch ($type) {
case 'search':
$qb = $repository->getBuilderForSearchByUser($this->getUser()->getId(), $searchTerm, $currentRoute);
@ -541,12 +543,15 @@ class EntryController extends Controller
break;
case 'starred':
$qb = $repository->getBuilderForStarredByUser($this->getUser()->getId());
$formOptions['filter_starred'] = true;
break;
case 'archive':
$qb = $repository->getBuilderForArchiveByUser($this->getUser()->getId());
$formOptions['filter_archived'] = true;
break;
case 'unread':
$qb = $repository->getBuilderForUnreadByUser($this->getUser()->getId());
$formOptions['filter_unread'] = true;
break;
case 'all':
$qb = $repository->getBuilderForAllByUser($this->getUser()->getId());
@ -555,7 +560,7 @@ class EntryController extends Controller
throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
}
$form = $this->createForm(EntryFilterType::class);
$form = $this->createForm(EntryFilterType::class, [], $formOptions);
if ($request->query->has($form->getName())) {
// manually bind values from the request