From 5d584346182e8955e04eb7ef1e9726fd7bd075dd Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sun, 15 Sep 2024 13:20:10 +0300 Subject: [PATCH] ref --- .../Classes/Select/Event/PrimaryFilters/Todays.php | 8 ++++---- .../Select/AccessControl/FilterResolverFactory.php | 13 +++---------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/application/Espo/Classes/Select/Event/PrimaryFilters/Todays.php b/application/Espo/Classes/Select/Event/PrimaryFilters/Todays.php index e46f90b36a..98f342047c 100644 --- a/application/Espo/Classes/Select/Event/PrimaryFilters/Todays.php +++ b/application/Espo/Classes/Select/Event/PrimaryFilters/Todays.php @@ -29,14 +29,14 @@ namespace Espo\Classes\Select\Event\PrimaryFilters; -use Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\BadRequest; use Espo\Core\Select\Primary\Filter; use Espo\Core\Select\Helpers\UserTimeZoneProvider; use Espo\Core\Select\Where\ConverterFactory; use Espo\Core\Select\Where\Item; use Espo\ORM\Query\SelectBuilder; use Espo\Entities\User; -use LogicException; +use RuntimeException; class Todays implements Filter { @@ -60,8 +60,8 @@ class Todays implements Filter $whereItem = $this->converterFactory ->create($this->entityType, $this->user) ->convert($queryBuilder, $item); - } catch (Error $e) { - throw new LogicException($e->getMessage()); + } catch (BadRequest $e) { + throw new RuntimeException('', 0, $e); } $queryBuilder->where($whereItem); diff --git a/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php b/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php index cc1239e065..030f14eb32 100644 --- a/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php +++ b/application/Espo/Core/Select/AccessControl/FilterResolverFactory.php @@ -29,7 +29,6 @@ namespace Espo\Core\Select\AccessControl; -use Espo\Core\Exceptions\Error; use Espo\Core\InjectableFactory; use Espo\Core\Acl; use Espo\Core\Portal\Acl as PortalAcl; @@ -38,9 +37,7 @@ use Espo\Core\Utils\Acl\UserAclManagerProvider; use Espo\Core\Binding\BindingContainer; use Espo\Core\Binding\Binder; use Espo\Core\Binding\BindingData; - use Espo\Entities\User; -use RuntimeException; class FilterResolverFactory { @@ -56,13 +53,9 @@ class FilterResolverFactory $this->getClassName($entityType) : $this->getPortalClassName($entityType); - try { - $acl = $this->userAclManagerProvider - ->get($user) - ->createUserAcl($user); - } catch (Error $e) { - throw new RuntimeException($e->getMessage()); - } + $acl = $this->userAclManagerProvider + ->get($user) + ->createUserAcl($user); $bindingData = new BindingData();