This commit is contained in:
Yuri Kuznetsov
2021-08-26 13:26:43 +03:00
parent 3dc53c5436
commit 8b4635ffaa
2 changed files with 5 additions and 6 deletions
+2 -3
View File
@@ -766,7 +766,7 @@ class Service implements Crud,
->withStrictAccessControl()
->withSearchParams($preparedSearchParams)
->withAdditionalApplierClassNameList(
$this->createSelectApplierClassNameList()->get($this->entityType)
$this->createSelectApplierClassNameListProvider()->get($this->entityType)
)
->build();
@@ -797,8 +797,7 @@ class Service implements Crud,
return new RecordCollection($collection, $total);
}
private function createSelectApplierClassNameList(): ApplierClassNameListProvider
protected function createSelectApplierClassNameListProvider(): ApplierClassNameListProvider
{
return $this->injectableFactory->create(ApplierClassNameListProvider::class);
}
+3 -3
View File
@@ -929,7 +929,7 @@ class Email extends Record implements
->from('Email')
->withAccessControlFilter();
$draftsSelectParams = clone $selectBuilder;
$draftsSelecBuilder = clone $selectBuilder;
$selectBuilder->withWhere(
WhereItem::fromRaw([
@@ -952,10 +952,10 @@ class Email extends Record implements
}
foreach ($folderIdList as $folderId) {
$itemSelectBuilder = $selectBuilder;
$itemSelectBuilder = clone $selectBuilder;
if ($folderId === 'drafts') {
$itemSelectBuilder = $draftsSelectParams;
$itemSelectBuilder = clone $draftsSelecBuilder;
}
$itemSelectBuilder->withWhere(