This commit is contained in:
Yuri Kuznetsov
2023-06-16 10:53:49 +03:00
6 changed files with 13 additions and 18 deletions
@@ -48,17 +48,12 @@ class AccessChecker implements AccessEntityCREDChecker
{ {
use DefaultAccessCheckerDependency; use DefaultAccessCheckerDependency;
private AclManager $aclManager;
private EntityManager $entityManager;
public function __construct( public function __construct(
DefaultAccessChecker $defaultAccessChecker, DefaultAccessChecker $defaultAccessChecker,
AclManager $aclManager, private AclManager $aclManager,
EntityManager $entityManager private EntityManager $entityManager
) { ) {
$this->defaultAccessChecker = $defaultAccessChecker; $this->defaultAccessChecker = $defaultAccessChecker;
$this->aclManager = $aclManager;
$this->entityManager = $entityManager;
} }
public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool
@@ -150,6 +145,10 @@ class AccessChecker implements AccessEntityCREDChecker
return null; return null;
} }
if ($note->getTargetType() === Note::TARGET_ALL) {
return true;
}
if (!$note->getParentId() || !$note->getParentType()) { if (!$note->getParentId() || !$note->getParentType()) {
return null; return null;
} }
@@ -56,12 +56,8 @@ class DefaultAssignmentNotificator implements AssignmentNotificator
if ($entity->hasLinkMultipleField('assignedUsers')) { if ($entity->hasLinkMultipleField('assignedUsers')) {
/** @var string[] $userIdList */ /** @var string[] $userIdList */
$userIdList = $entity->getLinkMultipleIdList('assignedUsers'); $userIdList = $entity->getLinkMultipleIdList('assignedUsers');
/** @var ?string[] $fetchedAssignedUserIdList */ /** @var string[] $fetchedAssignedUserIdList */
$fetchedAssignedUserIdList = $entity->getFetched('assignedUsersIds'); $fetchedAssignedUserIdList = $entity->getFetched('assignedUsersIds') ?? [];
if (!is_array($fetchedAssignedUserIdList)) {
$fetchedAssignedUserIdList = [];
}
foreach ($userIdList as $userId) { foreach ($userIdList as $userId) {
if (in_array($userId, $fetchedAssignedUserIdList)) { if (in_array($userId, $fetchedAssignedUserIdList)) {
@@ -89,7 +89,7 @@ class HookProcessor
private function processMultiple(CoreEntity $entity): void private function processMultiple(CoreEntity $entity): void
{ {
$userIdList = $entity->getLinkMultipleIdList('assignedUsers'); $userIdList = $entity->getLinkMultipleIdList('assignedUsers');
$fetchedAssignedUserIdList = $entity->getFetched('assignedUsersIds'); $fetchedAssignedUserIdList = $entity->getFetched('assignedUsersIds') ?? [];
foreach ($userIdList as $userId) { foreach ($userIdList as $userId) {
if ( if (
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "espocrm", "name": "espocrm",
"version": "7.5.0", "version": "7.5.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "espocrm", "name": "espocrm",
"version": "7.5.0", "version": "7.5.1",
"hasInstallScript": true, "hasInstallScript": true,
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "espocrm", "name": "espocrm",
"version": "7.5.0", "version": "7.5.1",
"description": "Open-source CRM.", "description": "Open-source CRM.",
"repository": { "repository": {
"type": "git", "type": "git",
+1 -1
View File
@@ -61,7 +61,7 @@ class AfterUpgrade
continue; continue;
} }
$data1 = $metadata->getCustom('selectDefs', $entityType); $data1 = $metadata->getCustom('selectDefs', $entityType) ?? (object) [];
$data1->primaryFilterClassNameMap = $primaryFilterClassNameMap; $data1->primaryFilterClassNameMap = $primaryFilterClassNameMap;
$metadata->saveCustom('selectDefs', $entityType, $data1); $metadata->saveCustom('selectDefs', $entityType, $data1);