fix: [element] Group context filter to support multiple conditions
parent
de4ba80e21
commit
00528112f1
|
@ -10,10 +10,10 @@
|
||||||
$currentQuery = $this->request->getQuery();
|
$currentQuery = $this->request->getQuery();
|
||||||
unset($currentQuery['page'], $currentQuery['limit'], $currentQuery['sort']);
|
unset($currentQuery['page'], $currentQuery['limit'], $currentQuery['sort']);
|
||||||
if (!empty($filteringContext['filterCondition'])) { // PHP replaces `.` by `_` when fetching the request parameter
|
if (!empty($filteringContext['filterCondition'])) { // PHP replaces `.` by `_` when fetching the request parameter
|
||||||
$currentFilteringContextKey = array_key_first($filteringContext['filterCondition']);
|
$currentFilteringContext = [];
|
||||||
$currentFilteringContext = [
|
foreach ($filteringContext['filterCondition'] as $currentFilteringContextKey => $value) {
|
||||||
str_replace('.', '_', $currentFilteringContextKey) => $filteringContext['filterCondition'][$currentFilteringContextKey]
|
$currentFilteringContext[str_replace('.', '_', $currentFilteringContextKey)] = $value;
|
||||||
];
|
}
|
||||||
} else {
|
} else {
|
||||||
$currentFilteringContext = $filteringContext['filterCondition'];
|
$currentFilteringContext = $filteringContext['filterCondition'];
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,9 @@
|
||||||
'onClick' => 'changeIndexContext',
|
'onClick' => 'changeIndexContext',
|
||||||
'onClickParams' => [
|
'onClickParams' => [
|
||||||
'this',
|
'this',
|
||||||
$this->Url->build($urlParams),
|
$this->Url->build($urlParams, [
|
||||||
|
'escape' => false, // URL builder escape `&` when multiple ? arguments
|
||||||
|
]),
|
||||||
"#table-container-${tableRandomValue}",
|
"#table-container-${tableRandomValue}",
|
||||||
"#table-container-${tableRandomValue} table.table",
|
"#table-container-${tableRandomValue} table.table",
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue