This commit is contained in:
Yuri Kuznetsov
2024-09-15 13:20:10 +03:00
parent d051a52750
commit 5d58434618
2 changed files with 7 additions and 14 deletions
@@ -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);
@@ -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();