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

permission string fix

Browse Source
This commit is contained in:
Yuri Kuznetsov
2024-04-19 11:42:37 +03:00
parent cd216007af
commit 46da1bb8a0
10 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/Espo/Classes/MassAction/User/MassDelete.php
View File

@@ -70,7 +70,7 @@ class MassDelete implements MassAction
if (
!$params->hasIds() &&
$this->acl->getPermissionLevel('massUpdatePermission') !== Acl\Table::LEVEL_YES
$this->acl->getPermissionLevel('massUpdate') !== Acl\Table::LEVEL_YES
) {
throw new Forbidden("No mass-update permission.");
}

2
application/Espo/Classes/MassAction/User/MassUpdate.php
View File

@@ -51,7 +51,7 @@ use Espo\Tools\MassUpdate\Data as MassUpdateData;
class MassUpdate implements MassAction
{
private const PERMISSION = 'massUpdatePermission';
private const PERMISSION = 'massUpdate';
/** @var string[] */
private array $notAllowedAttributeList = [

2
application/Espo/Classes/Select/User/AccessControlFilters/Mandatory.php
View File

@@ -51,7 +51,7 @@ class Mandatory implements Filter
]);
}
if ($this->aclManager->getPermissionLevel($this->user, 'portalPermission') !== Table::LEVEL_YES) {
if ($this->aclManager->getPermissionLevel($this->user, 'portal') !== Table::LEVEL_YES) {
$queryBuilder->where([
'OR' => [
'type!=' => User::TYPE_PORTAL,

2
application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php
View File

@@ -43,7 +43,7 @@ class OnlyOwn implements Filter
public function apply(SelectBuilder $queryBuilder): void
{
if ($this->aclManager->getPermissionLevel($this->user, 'portalPermission') === Table::LEVEL_YES) {
if ($this->aclManager->getPermissionLevel($this->user, 'portal') === Table::LEVEL_YES) {
$queryBuilder->where([
'OR' => [
'id' => $this->user->getId(),

2
application/Espo/Classes/Select/User/AccessControlFilters/OnlyTeam.php
View File

@@ -51,7 +51,7 @@ class OnlyTeam implements Filter
'id' => $this->user->getId(),
];
if ($this->aclManager->getPermissionLevel($this->user, 'portalPermission') === Table::LEVEL_YES) {
if ($this->aclManager->getPermissionLevel($this->user, 'portal') === Table::LEVEL_YES) {
$orGroup['type'] = User::TYPE_PORTAL;
}

2
application/Espo/Controllers/DataPrivacy.php
View File

@@ -42,7 +42,7 @@ class DataPrivacy
{
public function __construct(private Erasor $erasor, private Acl $acl)
{
if ($this->acl->getPermissionLevel('dataPrivacyPermission') === Acl\Table::LEVEL_NO) {
if ($this->acl->getPermissionLevel('dataPrivacy') === Acl\Table::LEVEL_NO) {
throw new Forbidden();
}
}

8
application/Espo/Core/Acl/DefaultAssignmentChecker.php
View File

@@ -99,7 +99,7 @@ class DefaultAssignmentChecker implements AssignmentChecker
return false;
}
$assignmentPermission = $this->aclManager->getPermissionLevel($user, 'assignmentPermission');
$assignmentPermission = $this->aclManager->getPermissionLevel($user, 'assignment');
if (
$assignmentPermission === Table::LEVEL_YES ||
@@ -157,7 +157,7 @@ class DefaultAssignmentChecker implements AssignmentChecker
protected function isPermittedTeams(User $user, Entity $entity): bool
{
$assignmentPermission = $this->aclManager->getPermissionLevel($user, 'assignmentPermission');
$assignmentPermission = $this->aclManager->getPermissionLevel($user, 'assignment');
if (!in_array($assignmentPermission, [Table::LEVEL_TEAM, Table::LEVEL_NO])) {
return true;
@@ -219,7 +219,7 @@ class DefaultAssignmentChecker implements AssignmentChecker
private function isPermittedTeamsEmpty(User $user, CoreEntity $entity): bool
{
$assignmentPermission = $this->aclManager->getPermissionLevel($user, 'assignmentPermission');
$assignmentPermission = $this->aclManager->getPermissionLevel($user, 'assignment');
if ($assignmentPermission !== Table::LEVEL_TEAM) {
return true;
@@ -259,7 +259,7 @@ class DefaultAssignmentChecker implements AssignmentChecker
return false;
}
$assignmentPermission = $this->aclManager->getPermissionLevel($user, 'assignmentPermission');
$assignmentPermission = $this->aclManager->getPermissionLevel($user, 'assignment');
if (
$assignmentPermission === Table::LEVEL_YES ||

2
application/Espo/Core/Mail/Account/SendingAccountProvider.php
View File

@@ -59,7 +59,7 @@ class SendingAccountProvider
public function getShared(User $user, string $emailAddress): ?Account
{
$level = $this->aclManager->getPermissionLevel($user, 'groupEmailAccountPermission');
$level = $this->aclManager->getPermissionLevel($user, 'groupEmailAccount');
$entity = null;

2
application/Espo/Tools/App/AppService.php
View File

@@ -334,7 +334,7 @@ class AppService
*/
private function getUserGroupEmailAddressList(User $user): array
{
$groupEmailAccountPermission = $this->acl->getPermissionLevel('groupEmailAccountPermission');
$groupEmailAccountPermission = $this->acl->getPermissionLevel('groupEmailAccount');
if (!$groupEmailAccountPermission || $groupEmailAccountPermission === Acl\Table::LEVEL_NO) {
return [];

2
tests/unit/Espo/Core/AclManagerTest.php
View File

@@ -133,6 +133,6 @@ class AclManagerTest extends \PHPUnit\Framework\TestCase
->with('assignment')
->willReturn(Table::LEVEL_YES);
$this->aclManager->getPermissionLevel($this->user, 'assignmentPermission');
$this->aclManager->getPermissionLevel($this->user, 'assignment');
}
}