diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index 1daa78fea2..ff9577a6bc 100644 --- a/lib/Alchemy/Phrasea/Application.php +++ b/lib/Alchemy/Phrasea/Application.php @@ -312,6 +312,7 @@ class Application extends SilexApplication 'Alchemy\Phrasea\ControllerProvider\Admin\SearchEngine' => [], 'Alchemy\Phrasea\ControllerProvider\Admin\Setup' => [], 'Alchemy\Phrasea\ControllerProvider\Admin\Subdefs' => [], + 'Alchemy\Phrasea\ControllerProvider\Admin\TaskManager' => [], 'Alchemy\Phrasea\ControllerProvider\Admin\Users' => [], 'Alchemy\Phrasea\ControllerProvider\Datafiles' => [], 'Alchemy\Phrasea\ControllerProvider\Lightbox' => [], @@ -622,8 +623,6 @@ class Application extends SilexApplication $this->mount('/login/', new Login()); $this->mount('/developers/', new Developers()); - $this->mount('/admin/task-manager', new TaskManager()); - $this->mount('/client/', new ClientRoot()); $this->mount('/prod/query/', new Query()); @@ -676,6 +675,7 @@ class Application extends SilexApplication '/admin/search-engine' => 'Alchemy\Phrasea\ControllerProvider\Admin\SearchEngine', '/admin/setup' => 'Alchemy\Phrasea\ControllerProvider\Admin\Setup', '/admin/subdefs' => 'Alchemy\Phrasea\ControllerProvider\Admin\Subdefs', + '/admin/task-manager' => 'Alchemy\Phrasea\ControllerProvider\Admin\TaskManager', '/admin/users' => 'Alchemy\Phrasea\ControllerProvider\Admin\Users', '/datafiles' => 'Alchemy\Phrasea\ControllerProvider\Datafiles', '/include/minify' => 'Alchemy\Phrasea\ControllerProvider\Minifier', diff --git a/lib/Alchemy/Phrasea/Controller/Admin/TaskManagerController.php b/lib/Alchemy/Phrasea/Controller/Admin/TaskManagerController.php index 0a3b1b4bf0..bbe065862d 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/TaskManagerController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/TaskManagerController.php @@ -140,7 +140,7 @@ class TaskManagerController extends Controller if ($request->getRequestFormat() === "json") { foreach ($tasks as $k => $task) { - $tasks[$k]['urls'] = $this->getTaskResourceUrls($this->app, $task['id']); + $tasks[$k]['urls'] = $this->getTaskResourceUrls($task['id']); } return $this->app->json($tasks); @@ -298,7 +298,7 @@ class TaskManagerController extends Controller return $this->app->json(array_replace([ 'id' => $task->getId(), 'name' => $task->getName(), - 'urls' => $this->getTaskResourceUrls($this->app, $task->getId()) + 'urls' => $this->getTaskResourceUrls($task->getId()) ], $this->getLiveInformationRequest()->getTask($task) ));