diff options
author | Belen Barros Pena <belen.barros.pena@intel.com> | 2014-02-21 08:58:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-11 12:24:31 -0700 |
commit | 65c298dedf75ae3fb1ff90ba5e4e8e53b8e2f390 (patch) | |
tree | 544d1886cb019228173bfdb0bc0b64fc5b185d3f /bitbake/lib | |
parent | 6b4aedc0c9bff86f868886fd86f3ae8f715ae765 (diff) | |
download | ast2050-yocto-poky-65c298dedf75ae3fb1ff90ba5e4e8e53b8e2f390.zip ast2050-yocto-poky-65c298dedf75ae3fb1ff90ba5e4e8e53b8e2f390.tar.gz |
bitbake: toaster: Fix help text for task details outcome
Changes made to models.py and task.html to make sure the
help text for the task outcome is displayed.
[YOCTO #5917]
(Bitbake rev: f3001af0b73f103a5d37af180e8c4c54a6249e97)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/toaster/orm/models.py | 20 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/task.html | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 6706da8..0646813 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -140,14 +140,14 @@ class Task(models.Model): (OUTCOME_EMPTY, 'Empty'), ) - TASK_OUTCOME_HELP = { - OUTCOME_SUCCESS:'This task completed successfully', - OUTCOME_COVERED:'This task did not run because its output is provided by another task', - OUTCOME_CACHED:'This task restored output from the sstate-cache directory or mirrors', - OUTCOME_PREBUILT:'This task did not run because its outcome was reused from a previous build', - OUTCOME_FAILED:'This task did not complete', - OUTCOME_NA:'' - } + TASK_OUTCOME_HELP = ( + (OUTCOME_SUCCESS, 'This task completed successfully'), + (OUTCOME_COVERED, 'This task did not run because its output is provided by another task'), + (OUTCOME_CACHED, 'This task restored output from the sstate-cache directory or mirrors'), + (OUTCOME_PREBUILT, 'This task did not run because its outcome was reused from a previous build'), + (OUTCOME_FAILED, 'This task did not complete'), + (OUTCOME_NA, ''), + ) search_allowed_fields = [ "recipe__name", "recipe__version", "task_name", "logfile" ] @@ -156,8 +156,8 @@ class Task(models.Model): def get_related_setscene(self): return Task.objects.related_setscene(self) - def outcome_help(self): - return Task.TASK_OUTCOME_HELP[self.outcome] + def get_outcome_help(self): + return Task.TASK_OUTCOME_HELP[self.outcome][1] def get_executed_display(self): if self.task_executed: diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html index c5d6176..a8bcb52 100644 --- a/bitbake/lib/toaster/toastergui/templates/task.html +++ b/bitbake/lib/toaster/toastergui/templates/task.html @@ -18,7 +18,7 @@ {# Outcome section #} <h2 {{ task|task_color:True }}> {{task.get_outcome_display}} - <i class="icon-question-sign get-help heading-help" title="" data-original-title="{{task.outcome_help}}"></i> + <i class="icon-question-sign get-help heading-help" title="{{task.get_outcome_help}}"></i> </h2> {%if task.task_executed %} {# executed tasks outcome #} |