EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Email inbox no group folder emails
Yurii87494ba91d45
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.phpindex 7b1e174f36..270639c9e9 100644--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php@@ -29,15 +29,10 @@namespace Espo\Classes\Select\Email\Where\ItemConverters;-use Espo\Core\Exceptions\BadRequest;-use Espo\Core\Exceptions\Forbidden;use Espo\Core\Name\Link;-use Espo\Core\Select\SelectBuilderFactory;use Espo\Core\Select\Where\ItemConverter;use Espo\Core\Select\Where\Item;-use Espo\Entities\Email;-use Espo\Entities\GroupEmailFolder;use Espo\ORM\Name\Attribute;use Espo\ORM\Query\SelectBuilder as QueryBuilder;use Espo\ORM\Query\Part\WhereItem as WhereClauseItem;@@ -46,7 +41,6 @@ use Espo\ORM\EntityManager;use Espo\Entities\User;use Espo\Classes\Select\Email\Helpers\JoinHelper;use Espo\Tools\Email\Folder;-use RuntimeException;/*** @noinspection PhpUnused@@ -57,7 +51,6 @@ class InFolder implements ItemConverterprivate User $user,private EntityManager $entityManager,private JoinHelper $joinHelper,- private SelectBuilderFactory $selectBuilderFactory) {}public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem@@ -80,8 +73,6 @@ class InFolder implements ItemConverter{$this->joinEmailUser($queryBuilder);- $groupEmailFoldersIds = $this->getUserGroupEmailFoldersIds();-$whereClause = [Email::ALIAS_INBOX . '.inTrash' => false,Email::ALIAS_INBOX . '.inArchive' => false,@@ -92,10 +83,7 @@ class InFolder implements ItemConverterEmail::STATUS_ARCHIVED,Email::STATUS_SENT,],- 'OR' => [- 'groupFolderId' => null,- 'groupFolderId!=' => $groupEmailFoldersIds,- ]+ 'groupFolderId' => null,],];@@ -260,34 +248,4 @@ class InFolder implements ItemConverterreturn $emailAddressIdList;}-- /**- * @return string[]- */- private function getUserGroupEmailFoldersIds(): array- {- $selectBuilder = $this->selectBuilderFactory- ->create()- ->forUser($this->user)- ->from(GroupEmailFolder::ENTITY_TYPE)- ->withAccessControlFilter();-- try {- $groupEmailFolders = $this->entityManager- ->getRDBRepositoryByClass(GroupEmailFolder::class)- ->clone($selectBuilder->build())- ->select([Attribute::ID])- ->find();- } catch (BadRequest|Forbidden $e) {- throw new RuntimeException('', 0, $e);- }-- $groupEmailFoldersIds = [];-- foreach ($groupEmailFolders as $groupEmailFolder) {- $groupEmailFoldersIds[] = $groupEmailFolder->getId();- }-- return $groupEmailFoldersIds;- }}