diff options
Diffstat (limited to 'apps/workflowengine/lib')
| -rw-r--r-- | apps/workflowengine/lib/Controller/UserWorkflowsController.php | 8 | ||||
| -rw-r--r-- | apps/workflowengine/lib/Manager.php | 2 | ||||
| -rw-r--r-- | apps/workflowengine/lib/Service/RuleMatcher.php | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/apps/workflowengine/lib/Controller/UserWorkflowsController.php b/apps/workflowengine/lib/Controller/UserWorkflowsController.php index 179e6b1ad11..3e907d22696 100644 --- a/apps/workflowengine/lib/Controller/UserWorkflowsController.php +++ b/apps/workflowengine/lib/Controller/UserWorkflowsController.php @@ -79,8 +79,8 @@ class UserWorkflowsController extends AWorkflowController { * @throws OCSBadRequestException * @throws OCSForbiddenException */ - public function create(string $class, string $name, array $checks, string $operation): DataResponse { - return parent::create($class, $name, $checks, $operation); + public function create(string $class, string $name, array $checks, string $operation, string $entity, array $events): DataResponse { + return parent::create($class, $name, $checks, $operation, $entity, $events); } /** @@ -88,8 +88,8 @@ class UserWorkflowsController extends AWorkflowController { * @throws OCSBadRequestException * @throws OCSForbiddenException */ - public function update(int $id, string $name, array $checks, string $operation): DataResponse { - return parent::update($id, $name, $checks, $operation); + public function update(int $id, string $name, array $checks, string $operation, string $entity, array $events): DataResponse { + return parent::update($id, $name, $checks, $operation, $entity, $events); } /** diff --git a/apps/workflowengine/lib/Manager.php b/apps/workflowengine/lib/Manager.php index 07438b2f7cb..1c2c76a94c4 100644 --- a/apps/workflowengine/lib/Manager.php +++ b/apps/workflowengine/lib/Manager.php @@ -561,6 +561,8 @@ class Manager implements IManager { $operation['checks'][] = $check; } + $operation['events'] = json_decode($operation['events'], true); + return $operation; } diff --git a/apps/workflowengine/lib/Service/RuleMatcher.php b/apps/workflowengine/lib/Service/RuleMatcher.php index bcfcd5dd219..95c68b63370 100644 --- a/apps/workflowengine/lib/Service/RuleMatcher.php +++ b/apps/workflowengine/lib/Service/RuleMatcher.php @@ -24,12 +24,9 @@ declare(strict_types=1); namespace OCA\WorkflowEngine\Service; -use OCA\WorkflowEngine\AppInfo\Application; -use OCA\WorkflowEngine\Entity\File; use OCA\WorkflowEngine\Helper\ScopeContext; use OCA\WorkflowEngine\Manager; use OCP\AppFramework\QueryException; -use OCP\Files\Node; use OCP\Files\Storage\IStorage; use OCP\IL10N; use OCP\IServerContainer; @@ -128,7 +125,7 @@ class RuleMatcher implements IRuleMatcher { list($entity, $subject) = $entityInfo; $checkInstance->setEntitySubject($entity, $subject); } - } else { + } else if(!$checkInstance instanceof ICheck) { // Check is invalid throw new \UnexpectedValueException($this->l->t('Check %s is invalid or does not exist', $check['class'])); } |