espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix filter

Browse Source
This commit is contained in:
yuri
2015-09-22 13:23:44 +03:00
parent a631e52f63
commit 7356bd98ab
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Controllers/Record.php
+12 -7
View File
@@ -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);
frontend/client/src/views/record/panels/relationship.js
+2 -2
View File
@@ -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;
}
},