hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-198 fix

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-07-30 18:49:42 +02:00
parent 37d7206b88
commit 190ccd7e3e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
View File

@@ -37,18 +37,20 @@ class TaskManager implements ControllerProviderInterface
})->bind('admin_tasks'); })->bind('admin_tasks');
$controllers->get('/tasks/', function (Application $app, Request $request) { $controllers->get('/tasks/', function (Application $app, Request $request) {
if ($request->getContentType() === 'json') {
if ($app['phraseanet.configuration']['main']['task-manager']['enabled']) {
return $app->json($app['task-manager']->toArray());
}
if ($request->getContentType() == 'json') { return $app->json(array());
return $app->json($app['task-manager']->toArray());
} else {
$template = 'admin/tasks/list.html.twig';
return $app['twig']->render($template, array(
'task_manager' => $app['task-manager'],
'scheduler_key' => \phrasea::scheduler_key($app)
));
} }
$template = 'admin/tasks/list.html.twig';
return $app['twig']->render($template, array(
'task_manager' => $app['task-manager'],
'scheduler_key' => \phrasea::scheduler_key($app)
));
})->bind('admin_tasks_list'); })->bind('admin_tasks_list');
$controllers->post('/tasks/create/', function (Application $app, Request $request) { $controllers->post('/tasks/create/', function (Application $app, Request $request) {