mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-15 12:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toaster: Fix help text for task details outcome

Browse Source 
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>
This commit is contained in:
Belen Barros Pena
2014-02-21 08:58:01 +00:00
committed by Richard Purdie
parent 6b4aedc0c9
commit 65c298dedf
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bitbake/lib/toaster/orm/models.py
View File

@@ -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:

2
bitbake/lib/toaster/toastergui/templates/task.html
View File

@@ -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 #}