Skip to content

EspoCRM – Open Source CRM Application

ref, comments

Yuri Kuznetsove37d35bc9b76
diff --git a/application/Espo/Modules/Crm/Tools/Calendar/Service.php b/application/Espo/Modules/Crm/Tools/Calendar/Service.php
index 302bc1c01e..90bfd8f052 100644
--- a/application/Espo/Modules/Crm/Tools/Calendar/Service.php
+++ b/application/Espo/Modules/Crm/Tools/Calendar/Service.php
@@ -298,7 +298,10 @@ class Service
'assignedUserId' => $userId,
];
- if ($seed->hasRelation('users') && $seed->getRelationType('users') === Entity::MANY_MANY) {
+ // @todo Use a metadata parameter scope > usersLink. Populate in an upgrade script.
+ $hasUsers = $seed->hasRelation('users') && $seed->getRelationType('users') === Entity::MANY_MANY;
+
+ if ($hasUsers) {
$orGroup['usersMiddle.userId'] = $userId;
}
@@ -343,13 +346,15 @@ class Service
throw new RuntimeException($e->getMessage());
}
- if ($seed->hasRelation('users') && $seed->getRelationType('users') === Entity::MANY_MANY) {
+ if ($hasUsers) {
+ // @todo Use sub-query.
$queryBuilder
->distinct()
->leftJoin('users');
}
if ($seed->hasRelation(Field::ASSIGNED_USERS)) {
+ // @todo Use sub-query.
$queryBuilder
->distinct()
->leftJoin(Field::ASSIGNED_USERS);