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

Merge pull request #1612 from jygaulier/PHRAS-846_tasks-logs

Browse Source 
Phras 846 tasks logs
This commit is contained in:
Benoît Burnichon
2016-01-06 10:14:48 +01:00
parent 99b7f89116 2a40e8230d
commit e3f49db7b6
9 changed files with 149 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Alchemy/Phrasea/Controller/Admin/TaskManagerController.php
View File

@@ -181,13 +181,13 @@ class TaskManagerController extends Controller
/** @var LogFileFactory $factory */
$factory = $this->app['task-manager.log-file.factory'];
$logFile = $factory->forManager();
if ($request->query->get('clr')) {
$logFile->clear();
if ($request->query->get('clr') && $request->query->get('version') !== null) {
$logFile->clear($request->query->get('version'));
}
return $this->render('admin/task-manager/log.html.twig', [
return $this->render('admin/task-manager/log_scheduler.html.twig', [
'logfile' => $logFile,
'logname' => 'Scheduler',
'version' => $request->query->get('version')
]);
}
@@ -196,13 +196,13 @@ class TaskManagerController extends Controller
/** @var LogFileFactory $factory */
$factory = $this->app['task-manager.log-file.factory'];
$logFile = $factory->forTask($task);
if ($request->query->get('clr')) {
$logFile->clear();
if ($request->query->get('clr') && $request->query->get('version') !== null) {
$logFile->clear($request->query->get('version'));
}
return $this->render('admin/task-manager/log.html.twig', [
return $this->render('admin/task-manager/log_task.html.twig', [
'logfile' => $logFile,
'logname' => sprintf('%s (task id %d)', $task->getName(), $task->getId()),
'version' => $request->query->get('version')
]);
}