From 438578e2997f718f4ab2f50f309364edb6e3b4f8 Mon Sep 17 00:00:00 2001 From: David Reyna Date: Fri, 14 Feb 2014 14:58:20 -0800 Subject: bitbake: toaster: extend Tasks to include Time, Disk IO, and CPU Usage Update the All Tasks page to also cover the Time, Disk I/O, and CPU Usage pages. Add filter count header support, and fix minor column enablements. [YOCTO #4387] (Bitbake rev: 7e78836ebbddf0240094fd79a18cb057d6c4f322) Signed-off-by: David Reyna Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/models.py | 4 +- .../toastergui/templates/basetable_top.html | 2 +- .../toastergui/templates/filtersnippet.html | 4 +- .../lib/toaster/toastergui/templates/tasks.html | 93 +++--- bitbake/lib/toaster/toastergui/views.py | 323 ++++++++++++--------- 5 files changed, 235 insertions(+), 191 deletions(-) (limited to 'bitbake/lib/toaster') diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index af44d86ff3..24d8d9c573 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -80,7 +80,7 @@ class Task(models.Model): (SSTATE_NA, 'Not Applicable'), # For rest of tasks, but they still need checking. (SSTATE_MISS, 'Missing'), # it is a miss (SSTATE_FAILED, 'Failed'), # there was a pkg, but the script failed - (SSTATE_RESTORED, 'Restored'), # succesfully restored + (SSTATE_RESTORED, 'Succeeded'), # successfully restored ) CODING_NA = 0 @@ -111,7 +111,7 @@ class Task(models.Model): (OUTCOME_EMPTY, 'Empty'), ) - search_allowed_fields = [ "recipe__name", "task_name" ] + search_allowed_fields = [ "recipe__name", "recipe__version", "task_name", "logfile" ] objects = TaskManager() diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index 9a8bacb384..fe534618d1 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html @@ -31,7 +31,7 @@