diff --git a/application/Espo/Core/Controllers/Record.php b/application/Espo/Core/Controllers/Record.php index bd432d3818..4cab6dab53 100644 --- a/application/Espo/Core/Controllers/Record.php +++ b/application/Espo/Core/Controllers/Record.php @@ -142,12 +142,13 @@ class Record extends Base 'asc' => $asc, 'sortBy' => $sortBy, 'q' => $q, - 'primaryFilter' => $primaryFilter, - 'textFilter' => $textFilter, - 'boolFilterList' => $boolFilterList + 'textFilter' => $textFilter ); - if ($request->get('filter')) { - $params['filter'] = $request->get('filter'); + if ($request->get('primaryFilter')) { + $params['primaryFilter'] = $request->get('primaryFilter'); + } + if ($request->get('boolFilterList')) { + $params['boolFilterList'] = $request->get('boolFilterList'); } $result = $this->getRecordService()->findEntities($params); @@ -184,9 +185,13 @@ class Record extends Base 'asc' => $asc, 'sortBy' => $sortBy, 'q' => $q, + 'textFilter' => $textFilter ); - if ($request->get('filter')) { - $params['filter'] = $request->get('filter'); + if ($request->get('primaryFilter')) { + $params['primaryFilter'] = $request->get('primaryFilter'); + } + if ($request->get('boolFilterList')) { + $params['boolFilterList'] = $request->get('boolFilterList'); } $result = $this->getRecordService()->findLinkedEntities($id, $link, $params); diff --git a/frontend/client/src/views/record/panels/relationship.js b/frontend/client/src/views/record/panels/relationship.js index cc060f2881..cdfa1f1a49 100644 --- a/frontend/client/src/views/record/panels/relationship.js +++ b/frontend/client/src/views/record/panels/relationship.js @@ -183,9 +183,9 @@ Espo.define('views/record/panels/relationship', ['views/record/panels/bottom', ' }, setFilter: function (filter) { - this.collection.data.filter = null; + this.collection.data.primaryFilter = null; if (filter) { - this.collection.data.filter = filter; + this.collection.data.primaryFilter = filter; } },