From b9ed5a7b84dba20cb0fe25b0481b2128dbca5e3b Mon Sep 17 00:00:00 2001 From: cdujeu Date: Sat, 19 Nov 2016 17:17:21 +0100 Subject: [PATCH] Fix #1288 --- core/src/plugins/action.scheduler/src/Scheduler.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/plugins/action.scheduler/src/Scheduler.php b/core/src/plugins/action.scheduler/src/Scheduler.php index 91a7e562de..c347870ece 100644 --- a/core/src/plugins/action.scheduler/src/Scheduler.php +++ b/core/src/plugins/action.scheduler/src/Scheduler.php @@ -326,8 +326,11 @@ public function handleTasks(ServerRequestInterface $requestInterface, ResponseIn $task = TaskService::getInstance()->getTaskById(InputFilter::sanitize($httpVars["task_id"], InputFilter::SANITIZE_ALPHANUM)); if($task !== null){ $children = $task->getChildrenTasks(); - if(!empty($children)){ - throw new PydioException("This task has currently jobs running, please wait that they are finished"); + foreach ($children as $child){ + if($child->getStatus() === Task::STATUS_RUNNING){ + throw new PydioException("This task has currently jobs running, please wait that they are finished"); + } + TaskService::getInstance()->deleteTask($child->getId()); } TaskService::getInstance()->deleteTask($task->getId()); }