EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
fix email group folders in inbox
Yuri Kuznetsovb78e87b3e3d7
diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.phpindex b086d43f01..b894acdce2 100644--- a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php+++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php@@ -29,6 +29,8 @@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;@@ -44,6 +46,7 @@ use Espo\ORM\EntityManager;use Espo\Entities\User;use Espo\Classes\Select\Email\Helpers\JoinHelper;use Espo\Tools\Email\Folder;+use RuntimeException;/*** @noinspection PhpUnused@@ -260,7 +263,7 @@ class InFolder implements ItemConverter}/**- * @return array<string>+ * @return string[]*/private function getUserGroupEmailFoldersIds(): array{@@ -270,10 +273,15 @@ class InFolder implements ItemConverter->from(GroupEmailFolder::ENTITY_TYPE)->withAccessControlFilter();- $groupEmailFolders = $this->entityManager- ->getRDBRepository(GroupEmailFolder::ENTITY_TYPE)- ->clone($selectBuilder->build())- ->find();+ try {+ $groupEmailFolders = $this->entityManager+ ->getRDBRepositoryByClass(GroupEmailFolder::class)+ ->clone($selectBuilder->build())+ ->select([Attribute::ID])+ ->find();+ } catch (BadRequest|Forbidden $e) {+ throw new RuntimeException('', 0, $e);+ }$groupEmailFoldersIds = [];diff --git a/application/Espo/Classes/Select/GroupEmailFolder/AccessControlFilters/OnlyTeam.php b/application/Espo/Classes/Select/GroupEmailFolder/AccessControlFilters/OnlyTeam.phpnew file mode 100644index 0000000000..9b3060737f--- /dev/null+++ b/application/Espo/Classes/Select/GroupEmailFolder/AccessControlFilters/OnlyTeam.php@@ -0,0 +1,56 @@+<?php+/************************************************************************+ * This file is part of EspoCRM.+ *+ * EspoCRM – Open Source CRM application.+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko+ * Website: https://www.espocrm.com+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ *+ * The interactive user interfaces in modified source and object code versions+ * of this program must display Appropriate Legal Notices, as required under+ * Section 5 of the GNU Affero General Public License version 3.+ *+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.+ ************************************************************************/++namespace Espo\Classes\Select\GroupEmailFolder\AccessControlFilters;++use Espo\Core\Name\Field;+use Espo\Core\Select\AccessControl\Filter;+use Espo\Core\Select\Helpers\RelationQueryHelper;+use Espo\Entities\GroupEmailFolder;+use Espo\Entities\User;+use Espo\ORM\Query\SelectBuilder as QueryBuilder;++/**+ * @noinspection PhpUnused+ */+class OnlyTeam implements Filter+{+ public function __construct(+ private User $user,+ private RelationQueryHelper $relationQueryHelper,+ ) {}++ public function apply(QueryBuilder $queryBuilder): void+ {+ $where = $this->relationQueryHelper+ ->prepareLinkWhereMany(GroupEmailFolder::ENTITY_TYPE, Field::TEAMS, $this->user->getTeamIdList());++ $queryBuilder->where($where);+ }+}diff --git a/application/Espo/Resources/metadata/selectDefs/GroupEmailFolder.json b/application/Espo/Resources/metadata/selectDefs/GroupEmailFolder.jsonnew file mode 100644index 0000000000..519ffb0893--- /dev/null+++ b/application/Espo/Resources/metadata/selectDefs/GroupEmailFolder.json@@ -0,0 +1,5 @@+{+ "accessControlFilterClassNameMap": {+ "onlyTeam": "Espo\\Classes\\Select\\GroupEmailFolder\\AccessControlFilters\\OnlyTeam"+ }+}