Skip to content

EspoCRM – Open Source CRM Application

use all primary filter

Yuri Kuznetsov915283d28870
diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/CountType.php b/application/Espo/Core/Formula/Functions/RecordGroup/CountType.php
index a8292a5795..ed760929ab 100644
--- a/application/Espo/Core/Formula/Functions/RecordGroup/CountType.php
+++ b/application/Espo/Core/Formula/Functions/RecordGroup/CountType.php
@@ -36,6 +36,7 @@ use Espo\Core\Formula\Exceptions\Error;
use Espo\Core\Formula\Functions\BaseFunction;
use Espo\Core\Formula\Functions\RecordGroup\Util\FindQueryUtil;
use Espo\Core\Di;
+use Espo\Core\Select\Primary\Filters\All;
use Espo\Core\Select\SelectBuilderFactory;
/**
@@ -68,6 +69,7 @@ class CountType extends BaseFunction implements
$builder = $this->injectableFactory->create(SelectBuilderFactory::class)
->create()
->forUser($this->user)
+ ->withPrimaryFilter(All::NAME)
->from($entityType);
(new FindQueryUtil())->applyFilter($builder, $filter, 2);
diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/ExistsType.php b/application/Espo/Core/Formula/Functions/RecordGroup/ExistsType.php
index 825e0cafc2..12d98357c5 100644
--- a/application/Espo/Core/Formula/Functions/RecordGroup/ExistsType.php
+++ b/application/Espo/Core/Formula/Functions/RecordGroup/ExistsType.php
@@ -36,6 +36,7 @@ use Espo\Core\Formula\Exceptions\Error;
use Espo\Core\Formula\Functions\BaseFunction;
use Espo\Core\Di;
use Espo\Core\Formula\Functions\RecordGroup\Util\FindQueryUtil;
+use Espo\Core\Select\Primary\Filters\All;
use Espo\Core\Select\SelectBuilderFactory;
/**
@@ -68,6 +69,7 @@ class ExistsType extends BaseFunction implements
$builder = $this->injectableFactory->create(SelectBuilderFactory::class)
->create()
->forUser($this->user)
+ ->withPrimaryFilter(All::NAME)
->from($entityType);
(new FindQueryUtil())->applyFilter($builder, $filter, 2);
diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/FindManyType.php b/application/Espo/Core/Formula/Functions/RecordGroup/FindManyType.php
index f614c96552..4d4c21e78f 100644
--- a/application/Espo/Core/Formula/Functions/RecordGroup/FindManyType.php
+++ b/application/Espo/Core/Formula/Functions/RecordGroup/FindManyType.php
@@ -38,6 +38,7 @@ use Espo\Core\Formula\Exceptions\Error as FormulaError;
use Espo\Core\Formula\Exceptions\TooFewArguments;
use Espo\Core\Formula\Func;
use Espo\Core\Formula\Functions\RecordGroup\Util\FindQueryUtil;
+use Espo\Core\Select\Primary\Filters\All;
use Espo\Core\Select\SelectBuilderFactory;
use Espo\ORM\Entity;
use Espo\ORM\EntityManager;
@@ -92,6 +93,7 @@ class FindManyType implements Func
$builder = $this->selectBuilderFactory
->create()
+ ->withPrimaryFilter(All::NAME)
->from($entityType);
$whereClause = [];
diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedManyType.php b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedManyType.php
index 40f946e621..b8692db001 100644
--- a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedManyType.php
+++ b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedManyType.php
@@ -41,6 +41,7 @@ use Espo\Core\Formula\ArgumentList;
use Espo\Core\Formula\Functions\BaseFunction;
use Espo\Core\Di;
use Espo\Core\Select\Helpers\RandomStringGenerator;
+use Espo\Core\Select\Primary\Filters\All;
use Espo\Core\Select\SelectBuilderFactory;
use Espo\ORM\Defs\Params\RelationParam;
use Espo\ORM\Name\Attribute;
@@ -165,6 +166,7 @@ class FindRelatedManyType extends BaseFunction implements
$builder = $this->injectableFactory->create(SelectBuilderFactory::class)
->create()
->forUser($this->user)
+ ->withPrimaryFilter(All::NAME)
->from($foreignEntityType);
$whereClause = [];
diff --git a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php
index 74c48cf87b..50eb14f230 100644
--- a/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php
+++ b/application/Espo/Core/Formula/Functions/RecordGroup/FindRelatedOneType.php
@@ -32,6 +32,7 @@ namespace Espo\Core\Formula\Functions\RecordGroup;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Exceptions\Forbidden;
use Espo\Core\ORM\Entity as CoreEntity;
+use Espo\Core\Select\Primary\Filters\All;
use Espo\Core\Select\SelectBuilderFactory;
use Espo\ORM\Defs\Params\RelationParam;
use Espo\ORM\Name\Attribute;
@@ -151,6 +152,7 @@ class FindRelatedOneType extends BaseFunction implements
$builder = $this->injectableFactory->create(SelectBuilderFactory::class)
->create()
->forUser($this->user)
+ ->withPrimaryFilter(All::NAME)
->from($foreignEntityType);
$whereClause = [];