Skip to content

issue #13, fix subfilter restriction #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VladZernov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

issue #13, fix subfilter restriction #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3275873
issue #13, fix subfilter restriction
VladZernov Sep 3, 2018
4685988
rewrited with recursion to support nesting
VladZernov Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions Action/ListAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class ListAction extends EntityAction
*/
public function executeAction(Request $request)
{
$filters = $this->getFilters($request);
$filters = $this->getFilters($request->query->all());

$page = $this->extractParam($filters, 'page', 1);
$perPage = $this->extractParam($filters, 'per-page', $this->options['default_per_page']);
Expand Down Expand Up @@ -70,22 +70,33 @@ public function executeAction(Request $request)
}

/**
* @param Request $request
*
* @param array $queryFilters
* @param null|string $parentFilter
* @return array
*
*/
protected function getFilters(Request $request)
protected function getFilters(array $queryFilters, ?string $parentFilter = null)
{
$filters = [];
$unknownParams = [];
static $filters = [];
static $unknownParams = [];

foreach ($queryFilters as $key => $value) {

$filter = $parentFilter ? "{$parentFilter}.{$key}" : $key;

foreach ($request->query->all() as $key => $value) {
if (!array_key_exists($key, $this->options['filters'])) {
$unknownParams[] = '"'.$key.'"';
if (is_array($value)) {

$this->getFilters($value, $filter);
continue;
}

$filters[$key] = $this->processFilter($key, $value);
if (!array_key_exists($filter, $this->options['filters'])) {
$unknownParams[] = '"'.$filter.'"';
continue;
}

$filters[$filter] = $this->processFilter($filter, $value);

}

if (count($unknownParams)) {
Expand Down