This commit is contained in:
Yuri Kuznetsov
2022-12-20 14:36:58 +02:00
parent 185a24f007
commit 336bb95d11
4 changed files with 14 additions and 35 deletions
@@ -30,20 +30,13 @@
namespace Espo\Core\Portal\Acl\Traits;
use Espo\ORM\Entity;
use Espo\Entities\User;
use Espo\Core\{
Acl\ScopeData,
Portal\Acl\DefaultAccessChecker,
};
use Espo\Core\Acl\ScopeData;
use Espo\Core\Portal\Acl\DefaultAccessChecker;
trait DefaultAccessCheckerDependency
{
/**
* @var DefaultAccessChecker
*/
private $defaultAccessChecker;
private DefaultAccessChecker $defaultAccessChecker;
public function check(User $user, ScopeData $data): bool
{
@@ -30,11 +30,9 @@
namespace Espo\Modules\Crm\Classes\Acl\Call;
use Espo\Entities\User;
use Espo\Modules\Crm\Entities\Call;
use Espo\ORM\Entity;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\Acl\AccessEntityCREDSChecker;
use Espo\Core\Acl\DefaultAccessChecker;
use Espo\Core\Acl\ScopeData;
@@ -42,14 +40,12 @@ use Espo\Core\Acl\Table;
use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
/**
* @implements AccessEntityCREDSChecker<\Espo\Modules\Crm\Entities\Call>
* @implements AccessEntityCREDSChecker<Call>
*/
class AccessChecker implements AccessEntityCREDSChecker
{
use DefaultAccessCheckerDependency;
private $defaultAccessChecker;
public function __construct(DefaultAccessChecker $defaultAccessChecker)
{
$this->defaultAccessChecker = $defaultAccessChecker;
@@ -30,11 +30,9 @@
namespace Espo\Modules\Crm\Classes\Acl\Meeting;
use Espo\Entities\User;
use Espo\Modules\Crm\Entities\Meeting;
use Espo\ORM\Entity;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\Acl\AccessEntityCREDSChecker;
use Espo\Core\Acl\DefaultAccessChecker;
use Espo\Core\Acl\ScopeData;
@@ -42,14 +40,12 @@ use Espo\Core\Acl\Table;
use Espo\Core\Acl\Traits\DefaultAccessCheckerDependency;
/**
* @implements AccessEntityCREDSChecker<\Espo\Modules\Crm\Entities\Meeting>
* @implements AccessEntityCREDSChecker<Meeting>
*/
class AccessChecker implements AccessEntityCREDSChecker
{
use DefaultAccessCheckerDependency;
private $defaultAccessChecker;
public function __construct(DefaultAccessChecker $defaultAccessChecker)
{
$this->defaultAccessChecker = $defaultAccessChecker;
@@ -30,27 +30,21 @@
namespace Espo\Modules\Crm\Classes\AclPortal\KnowledgeBaseArticle;
use Espo\Entities\User;
use Espo\Modules\Crm\Entities\KnowledgeBaseArticle;
use Espo\ORM\Entity;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\{
Acl\ScopeData,
Acl\AccessEntityCREDChecker,
Portal\Acl\DefaultAccessChecker,
Portal\Acl\Traits\DefaultAccessCheckerDependency,
};
use Espo\Core\Acl\AccessEntityCREDChecker;
use Espo\Core\Acl\ScopeData;
use Espo\Core\Portal\Acl\DefaultAccessChecker;
use Espo\Core\Portal\Acl\Traits\DefaultAccessCheckerDependency;
/**
* @implements AccessEntityCREDChecker<\Espo\Modules\Crm\Entities\KnowledgeBaseArticle>
* @implements AccessEntityCREDChecker<KnowledgeBaseArticle>
*/
class AccessChecker implements AccessEntityCREDChecker
{
use DefaultAccessCheckerDependency;
private $defaultAccessChecker;
public function __construct(DefaultAccessChecker $defaultAccessChecker)
{
$this->defaultAccessChecker = $defaultAccessChecker;
@@ -62,7 +56,7 @@ class AccessChecker implements AccessEntityCREDChecker
return false;
}
if ($entity->get('status') !== 'Published') {
if ($entity->get('status') !== KnowledgeBaseArticle::STATUS_PUBLISHED) {
return false;
}