EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Fix pipeline acl
Yurii41ca1ffa7671
diff --git a/application/Espo/Classes/Acl/Pipeline/AccessChecker.php b/application/Espo/Classes/Acl/Pipeline/AccessChecker.phpindex 070afcb422..a06a68fddb 100644--- a/application/Espo/Classes/Acl/Pipeline/AccessChecker.php+++ b/application/Espo/Classes/Acl/Pipeline/AccessChecker.php@@ -91,7 +91,7 @@ class AccessChecker implements AccessEntityCREDCheckerreturn true;}- if (!$data->isFalse()) {+ if (!$data->isTrue()) {return false;}diff --git a/application/Espo/Classes/Acl/PipelineStage/AccessChecker.php b/application/Espo/Classes/Acl/PipelineStage/AccessChecker.phpindex 3272eeec33..e250b0f6c6 100644--- a/application/Espo/Classes/Acl/PipelineStage/AccessChecker.php+++ b/application/Espo/Classes/Acl/PipelineStage/AccessChecker.php@@ -91,7 +91,7 @@ class AccessChecker implements AccessEntityCREDCheckerreturn true;}- if (!$data->isFalse()) {+ if (!$data->isTrue()) {return false;}diff --git a/tests/integration/Espo/Tools/Pipeline/PipelineTest.php b/tests/integration/Espo/Tools/Pipeline/PipelineTest.phpindex 2a97027dd5..d6a0efb142 100644--- a/tests/integration/Espo/Tools/Pipeline/PipelineTest.php+++ b/tests/integration/Espo/Tools/Pipeline/PipelineTest.php@@ -31,6 +31,7 @@ namespace tests\integration\Espo\Tools\Pipeline;use Espo\Classes\AppParams\Pipelines;use Espo\Core\Acl\Table;+use Espo\Core\AclManager;use Espo\Core\Exceptions\BadRequest;use Espo\Core\Field\Date;use Espo\Core\Name\Field;@@ -114,11 +115,11 @@ class PipelineTest extends BaseTestCase$pipelineStageService->delete($stage->getId(), DeleteParams::create());}- $pipelineStageService->create((object) [+ $stage2_1 = $pipelineStageService->create((object) [Field::NAME => 'Open',PipelineStage::ATTR_PIPELINE_ID => $pipeline2->getId(),PipelineStage::FIELD_MAPPED_STATUS => 'Prospecting',- ], CreateParams::create());+ ], CreateParams::create())->getEntity();$pipelineStageService->create((object) [Field::NAME => 'Closed Won',@@ -209,6 +210,15 @@ class PipelineTest extends BaseTestCase$pipelines = $pipelinesParam->get();$this->assertCount(1, $pipelines[Opportunity::ENTITY_TYPE]);++ //++ $aclManager = $this->getContainer()->getByClass(AclManager::class);++ $this->assertFalse($aclManager->checkEntityRead($user1, $pipeline1));+ $this->assertTrue($aclManager->checkEntityRead($user1, $pipeline2));++ $this->assertTrue($aclManager->checkEntityRead($user1, $stage2_1));}/**