viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

type fixes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-03-24 12:34:40 +02:00
parent ceddfd8486
commit f1c0ccf97d
20 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
application/Espo/Classes/Acl/Attachment/AccessChecker.php
View File

@@ -78,20 +78,20 @@ class AccessChecker implements AccessEntityCREDChecker
$parent = null;
$hasParent = false;
$parentType = $entity->get('parentType');
$parentId = $entity->get('parentId');
if ($entity->get('parentId') && $entity->get('parentType')) {
$hasParent = true;
$relatedType = $entity->get('relatedType');
$relatedId = $entity->get('relatedId');
$parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
if ($parentId && $parentType) {
$parent = $this->entityManager->getEntityById($parentType, $parentId);
}
else if ($entity->get('relatedId') && $entity->get('relatedType')) {
$hasParent = true;
$parent = $this->entityManager->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
else if ($relatedId && $relatedType) {
$parent = $this->entityManager->getEntityById($relatedType, $relatedId);
}
if (!$parent || !$hasParent) {
if (!$parent) {
if ($this->defaultAccessChecker->checkEntityRead($user, $entity, $data)) {
return true;
}
@@ -132,8 +132,8 @@ class AccessChecker implements AccessEntityCREDChecker
{
if ($note->getTargetType() === Note::TARGET_TEAMS) {
$intersect = array_intersect(
$note->getLinkMultipleIdList('teams'),
$user->getLinkMultipleIdList('teams')
$note->getLinkMultipleIdList('teams') ?? [],
$user->getLinkMultipleIdList('teams') ?? []
);
if (count($intersect)) {

1
application/Espo/Classes/Acl/Email/AccessChecker.php
View File

@@ -104,6 +104,7 @@ class AccessChecker implements AccessEntityCREDSChecker
return true;
}
/** @var string[] */
$assignedUserIdList = $entity->getLinkMultipleIdList('assignedUsers');
if (

1
application/Espo/Classes/Acl/Team/OwnershipChecker.php
View File

@@ -44,6 +44,7 @@ class OwnershipChecker implements OwnershipOwnChecker
{
public function checkOwn(User $user, Entity $entity): bool
{
/** @var string[] */
$userTeamIdList = $user->getLinkMultipleIdList('teams');
return in_array($entity->getId(), $userTeamIdList);

4
application/Espo/Classes/Acl/User/OwnershipChecker.php
View File

@@ -54,8 +54,8 @@ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker
assert($entity instanceof CoreEntity);
$intersect = array_intersect(
$user->getLinkMultipleIdList('teams'),
$entity->getLinkMultipleIdList('teams')
$user->getLinkMultipleIdList('teams') ?? [],
$entity->getLinkMultipleIdList('teams') ?? []
);
if (count($intersect)) {

23
application/Espo/Classes/AclPortal/Attachment/AccessChecker.php
View File

@@ -79,20 +79,21 @@ class AccessChecker implements AccessEntityCREDChecker
}
$parent = null;
$hasParent = false;
if ($entity->get('parentId') && $entity->get('parentType')) {
$hasParent = true;
$parentType = $entity->get('parentType');
$parentId = $entity->get('parentId');
$parent = $this->entityManager->getEntity($entity->get('parentType'), $entity->get('parentId'));
$relatedType = $entity->get('relatedType');
$relatedId = $entity->get('relatedId');
if ($parentId && $parentType) {
$parent = $this->entityManager->getEntityById($parentType, $parentId);
}
else if ($entity->get('relatedId') && $entity->get('relatedType')) {
$hasParent = true;
$parent = $this->entityManager->getEntity($entity->get('relatedType'), $entity->get('relatedId'));
else if ($relatedId && $relatedType) {
$parent = $this->entityManager->getEntityById($relatedType, $relatedId);
}
if (!$hasParent) {
if (!$parent) {
if ($entity->get('createdById') === $user->getId()) {
return true;
}
@@ -137,8 +138,8 @@ class AccessChecker implements AccessEntityCREDChecker
if ($note->getTargetType() === Note::TARGET_PORTALS) {
$intersect = array_intersect(
$note->getLinkMultipleIdList('portals'),
$user->getLinkMultipleIdList('portals')
$note->getLinkMultipleIdList('portals') ?? [],
$user->getLinkMultipleIdList('portals') ?? []
);
if (count($intersect)) {

5
application/Espo/Classes/FieldValidators/LinkMultipleType.php
View File

@@ -40,6 +40,9 @@ class LinkMultipleType
return false;
}
return count($entity->getLinkMultipleIdList($field)) > 0;
/** @var string[] */
$idList = $entity->getLinkMultipleIdList($field);
return count($idList) > 0;
}
}

2
application/Espo/Classes/JobPreparators/CheckEmailAccounts.php
View File

@@ -93,7 +93,7 @@ class CheckEmailAccounts implements Preparator
continue;
}
$jobEntity = $this->entityManager->getEntity(JobEntity::ENTITY_TYPE);
$jobEntity = $this->entityManager->getNewEntity(JobEntity::ENTITY_TYPE);
$jobEntity->set([
'name' => $data->getName(),

2
application/Espo/Classes/JobPreparators/CheckInboundEmails.php
View File

@@ -91,7 +91,7 @@ class CheckInboundEmails implements Preparator
continue;
}
$jobEntity = $this->entityManager->getEntity(JobEntity::ENTITY_TYPE);
$jobEntity = $this->entityManager->getNewEntity(JobEntity::ENTITY_TYPE);
$jobEntity->set([
'name' => $data->getName(),

3
application/Espo/Classes/Jobs/CheckNewExtensionVersion.php
View File

@@ -40,7 +40,8 @@ class CheckNewExtensionVersion extends CheckNewVersion
return;
}
$job = $this->entityManager->getEntity('Job');
$job = $this->entityManager->getNewEntity('Job');
$job->set([
'name' => 'Check for new versions of installed extensions (job)',
'serviceName' => 'AdminNotifications',

2
application/Espo/Classes/Jobs/CheckNewVersion.php
View File

@@ -62,7 +62,7 @@ class CheckNewVersion implements JobDataLess
return;
}
$job = $this->entityManager->getEntity('Job');
$job = $this->entityManager->getNewEntity('Job');
$job->set([
'name' => 'Check for New Version (job)',

4
application/Espo/Classes/Select/Email/AccessControlFilters/OnlyOwn.php
View File

@@ -53,10 +53,10 @@ class OnlyOwn implements Filter
public function apply(QueryBuilder $queryBuilder): void
{
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->id);
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
$queryBuilder->where([
'emailUser.userId' => $this->user->id,
'emailUser.userId' => $this->user->getId(),
]);
}
}

6
application/Espo/Classes/Select/Email/AccessControlFilters/OnlyTeam.php
View File

@@ -53,16 +53,14 @@ class OnlyTeam implements Filter
public function apply(QueryBuilder $queryBuilder): void
{
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->id);
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
$queryBuilder->distinct();
$queryBuilder->leftJoin('teams', 'teamsAccess');
$queryBuilder->where([
'OR' => [
'teamsAccessMiddle.teamId' => $this->user->getLinkMultipleIdList('teams'),
'emailUser.userId' => $this->user->id,
'emailUser.userId' => $this->user->getId(),
]
]);
}

5
application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
View File

@@ -53,14 +53,15 @@ class PortalOnlyAccount implements Filter
public function apply(QueryBuilder $queryBuilder): void
{
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->id);
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
$queryBuilder->distinct();
$orGroup = [
'emailUser.userId' => $this->user->id,
'emailUser.userId' => $this->user->getId(),
];
/** @var string[] */
$accountIdList = $this->user->getLinkMultipleIdList('accounts');
if (count($accountIdList)) {

4
application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php
View File

@@ -53,12 +53,12 @@ class PortalOnlyContact implements Filter
public function apply(QueryBuilder $queryBuilder): void
{
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->id);
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
$queryBuilder->distinct();
$orGroup = [
'emailUser.userId' => $this->user->id,
'emailUser.userId' => $this->user->getId(),
];
$contactId = $this->user->get('contactId');

2
application/Espo/Classes/Select/Email/AdditionalAppliers/Main.php
View File

@@ -70,7 +70,7 @@ class Main implements AdditionalApplier
protected function joinEmailUser(SelectBuilder $queryBuilder): void
{
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->id);
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
if ($queryBuilder->build()->getSelect() === []) {
$queryBuilder->select('*');

2
application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php
View File

@@ -56,7 +56,7 @@ class IsImportantIsFalse implements ItemConverter
public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
{
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->id);
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
return WhereClause::fromRaw([
'emailUser.isImportant' => false,

2
application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php
View File

@@ -56,7 +56,7 @@ class IsImportantIsTrue implements ItemConverter
public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
{
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->id);
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
return WhereClause::fromRaw([
'emailUser.isImportant' => true,

2
application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php
View File

@@ -56,7 +56,7 @@ class IsNotReadIsFalse implements ItemConverter
public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
{
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->id);
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
return WhereClause::fromRaw([
'emailUser.isRead' => true,

4
application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php
View File

@@ -56,13 +56,13 @@ class IsNotReadIsTrue implements ItemConverter
public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem
{
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->id);
$this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId());
return WhereClause::fromRaw([
'emailUser.isRead' => false,
'OR' => [
'sentById' => null,
'sentById!=' => $this->user->id
'sentById!=' => $this->user->getId()
],
]);
}

1
application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
View File

@@ -50,6 +50,7 @@ class OnlyMyTeam implements Filter
public function apply(SelectBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void
{
/** @var string[] */
$teamIdList = $this->user->getLinkMultipleIdList('teams');
if (count($teamIdList) === 0) {