oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Merge pull request #4972 from wallabag/fix/2533-filter-active-menu

Browse source 
Preselect currently active section in the filter menu
This commit is contained in:
Jérémy Benoist 2021-01-25 09:30:03 +01:00 • committed by GitHub
commit b50cd2564c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

6
src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
View file

@ -118,12 +118,15 @@ class EntryFilterType extends AbstractType
])
->add('isArchived', CheckboxFilterType::class, [
'label' => 'entry.filters.archived_label',
'data' => $options['filter_archived'],
])
->add('isStarred', CheckboxFilterType::class, [
'label' => 'entry.filters.starred_label',
'data' => $options['filter_starred'],
])
->add('isUnread', CheckboxFilterType::class, [
'label' => 'entry.filters.unread_label',
'data' => $options['filter_unread'],
'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
if (false === $values['value']) {
return;
@ -177,6 +180,9 @@ class EntryFilterType extends AbstractType
$resolver->setDefaults([
'csrf_protection' => false,
'validation_groups' => ['filtering'],
'filter_archived' => false,
'filter_starred' => false,
'filter_unread' => false,
]);
}
}