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 | |
parent | 6b4aedc0c9bff86f868886fd86f3ae8f715ae765 (diff) | |
download | 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')
-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 6706da8a5e..0646813552 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -140,14 +140,14 @@ class Task(models.Model): | |||
140 | (OUTCOME_EMPTY, 'Empty'), | 140 | (OUTCOME_EMPTY, 'Empty'), |
141 | ) | 141 | ) |
142 | 142 | ||
143 | TASK_OUTCOME_HELP = { | 143 | TASK_OUTCOME_HELP = ( |
144 | OUTCOME_SUCCESS:'This task completed successfully', | 144 | (OUTCOME_SUCCESS, 'This task completed successfully'), |
145 | OUTCOME_COVERED:'This task did not run because its output is provided by another task', | 145 | (OUTCOME_COVERED, 'This task did not run because its output is provided by another task'), |
146 | OUTCOME_CACHED:'This task restored output from the sstate-cache directory or mirrors', | 146 | (OUTCOME_CACHED, 'This task restored output from the sstate-cache directory or mirrors'), |
147 | OUTCOME_PREBUILT:'This task did not run because its outcome was reused from a previous build', | 147 | (OUTCOME_PREBUILT, 'This task did not run because its outcome was reused from a previous build'), |
148 | OUTCOME_FAILED:'This task did not complete', | 148 | (OUTCOME_FAILED, 'This task did not complete'), |
149 | OUTCOME_NA:'' | 149 | (OUTCOME_NA, ''), |
150 | } | 150 | ) |
151 | 151 | ||
152 | search_allowed_fields = [ "recipe__name", "recipe__version", "task_name", "logfile" ] | 152 | search_allowed_fields = [ "recipe__name", "recipe__version", "task_name", "logfile" ] |
153 | 153 | ||
@@ -156,8 +156,8 @@ class Task(models.Model): | |||
156 | def get_related_setscene(self): | 156 | def get_related_setscene(self): |
157 | return Task.objects.related_setscene(self) | 157 | return Task.objects.related_setscene(self) |
158 | 158 | ||
159 | def outcome_help(self): | 159 | def get_outcome_help(self): |
160 | return Task.TASK_OUTCOME_HELP[self.outcome] | 160 | return Task.TASK_OUTCOME_HELP[self.outcome][1] |
161 | 161 | ||
162 | def get_executed_display(self): | 162 | def get_executed_display(self): |
163 | if self.task_executed: | 163 | if self.task_executed: |
diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html index c5d6176b62..a8bcb52194 100644 --- a/bitbake/lib/toaster/toastergui/templates/task.html +++ b/bitbake/lib/toaster/toastergui/templates/task.html | |||
@@ -18,7 +18,7 @@ | |||
18 | {# Outcome section #} | 18 | {# Outcome section #} |
19 | <h2 {{ task|task_color:True }}> | 19 | <h2 {{ task|task_color:True }}> |
20 | {{task.get_outcome_display}} | 20 | {{task.get_outcome_display}} |
21 | <i class="icon-question-sign get-help heading-help" title="" data-original-title="{{task.outcome_help}}"></i> | 21 | <i class="icon-question-sign get-help heading-help" title="{{task.get_outcome_help}}"></i> |
22 | </h2> | 22 | </h2> |
23 | {%if task.task_executed %} | 23 | {%if task.task_executed %} |
24 | {# executed tasks outcome #} | 24 | {# executed tasks outcome #} |