mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18461 from nextcloud/fix/noid/ensure-entity-on-scope-extension 

Flows that are managing themselves do not necessarily set the entity
This commit is contained in:
blizzz 2019-12-18 11:09:12 +01:00 committed by GitHub
parent 34c48aaa92 0a00903261
commit 47a4a037ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/workflowengine/lib/Service/RuleMatcher.php
View File

@ -121,6 +121,7 @@ class RuleMatcher implements IRuleMatcher {
$operations = array_merge($operations, $this->manager->getOperations($class, $scope)); $operations = array_merge($operations, $this->manager->getOperations($class, $scope));
} }
if($this->entity instanceof IEntity) {
$additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class); $additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class);
foreach ($additionalScopes as $hash => $scopeCandidate) { foreach ($additionalScopes as $hash => $scopeCandidate) {
/** @var ScopeContext $scopeCandidate */ /** @var ScopeContext $scopeCandidate */
@ -131,6 +132,7 @@ class RuleMatcher implements IRuleMatcher {
$operations = array_merge($operations, $this->manager->getOperations($class, $scopeCandidate)); $operations = array_merge($operations, $this->manager->getOperations($class, $scopeCandidate));
} }
} }
}
$matches = []; $matches = [];
foreach ($operations as $operation) { foreach ($operations as $operation) {