cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

chg: [CRUD] Passes active filters to the view

pull/40/head
mokaddem 2021-03-10 09:36:45 +01:00
parent 67d6683ed8
commit 9a1b38ff5a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Controller/Component/CRUDComponent.php
View File

@ -396,17 +396,19 @@ class CRUDComponent extends Component
} }
} }
$activeFilters = [];
if (!empty($customFilteringFunction['filterConditionFunction'])) { if (!empty($customFilteringFunction['filterConditionFunction'])) {
$query = $customFilteringFunction['filterConditionFunction']($query); $query = $customFilteringFunction['filterConditionFunction']($query);
$activeFilters['filteringLabel'] = $filteringLabel;
} else { } else {
if (!empty($chosenFilter)) { if (!empty($chosenFilter)) {
$params = $this->massageFilters($chosenFilter['filterCondition']); $params = $this->massageFilters($chosenFilter['filterCondition']);
} else { } else {
$params = $this->massageFilters($params); $params = $this->massageFilters($params);
} }
$conditions = array();
if (!empty($params['simpleFilters'])) { if (!empty($params['simpleFilters'])) {
foreach ($params['simpleFilters'] as $filter => $filterValue) { foreach ($params['simpleFilters'] as $filter => $filterValue) {
$activeFilters[$filter] = $filterValue;
if ($filter === 'quickFilter') { if ($filter === 'quickFilter') {
continue; continue;
} }
@ -419,12 +421,13 @@ class CRUDComponent extends Component
} }
if (!empty($params['relatedFilters'])) { if (!empty($params['relatedFilters'])) {
foreach ($params['relatedFilters'] as $filter => $filterValue) { foreach ($params['relatedFilters'] as $filter => $filterValue) {
$activeFilters[$filter] = $filterValue;
$filterParts = explode('.', $filter); $filterParts = explode('.', $filter);
$query = $this->setNestedRelatedCondition($query, $filterParts, $filterValue); $query = $this->setNestedRelatedCondition($query, $filterParts, $filterValue);
} }
} }
} }
$this->Controller->set('activeFilters', $activeFilters);
return $query; return $query;
} }