mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 09:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toaster: Not using task_color tag for execution heading

Browse Source 
The modifications to the task_color tag in commit
23a7c338d387ac2ba13a7a1114a4abc75228c960 broke the styling
of failed tasks in the tasks.html template. Undo the
changes to the task_color tag and use an if statement
instead to set the .muted class when the execution
heading says "Not executed".

(Bitbake rev: e3b3205674f606b927f1bf568202a592ca6453c9)

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-20 08:13:17 +00:00
committed by Richard Purdie
parent d24584f896
commit b2e5cab1b5
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,15 +131,16 @@
{% endif %} {% endif %}
{# Execution section #} {# Execution section #}
<h2 {{task|task_color}}>
{% if task.task_executed %} {% if task.task_executed %}
<h2>
Executed Executed
<i class="icon-question-sign get-help heading-help" title="Executed tasks are those that need to run in order to generate the task output"></i> <i class="icon-question-sign get-help heading-help" title="Executed tasks are those that need to run in order to generate the task output"></i>
{% else %} {% else %}
<h2 class="muted">
Not Executed Not Executed
<i class="icon-question-sign get-help heading-help" title="Not executed tasks don't need to run because their outcome is provided by another task"></i> <i class="icon-question-sign get-help heading-help" title="Not executed tasks don't need to run because their outcome is provided by another task"></i>
{% endif %} {% endif %}
</h2> </h2>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt> <dt>
<i class="icon-question-sign get-help" title="To make builds more efficient, the build system detects changes in the 'inputs' to a given task by creating a 'task signature'. If the signature changes, the build system assumes the inputs have changed and the task needs to be rerun"></i> <i class="icon-question-sign get-help" title="To make builds more efficient, the build system detects changes in the 'inputs' to a given task by creating a 'task signature'. If the signature changes, the build system assumes the inputs have changed and the task needs to be rerun"></i>

6
bitbake/lib/toaster/toastergui/templatetags/projecttags.py
View File

@@ -70,16 +70,16 @@ def sortcols(tablecols):
return sorted(tablecols, key = lambda t: t['name']) return sorted(tablecols, key = lambda t: t['name'])
@register.filter @register.filter
def task_color(task_object, show_colour=False): def task_color(task_object, show_green=False):
""" Return css class depending on Task execution status and execution outcome. """ Return css class depending on Task execution status and execution outcome.
By default, green is not returned for executed and successful tasks; By default, green is not returned for executed and successful tasks;
show_green argument should be True to get green color. show_green argument should be True to get green color.
""" """
if not task_object.task_executed: if not task_object.task_executed:
return 'class=muted' return 'class=muted'
elif task_object.outcome == task_object.OUTCOME_FAILED and show_colour: elif task_object.outcome == task_object.OUTCOME_FAILED:
return 'class=error' return 'class=error'
elif task_object.outcome == task_object.OUTCOME_SUCCESS and show_colour: elif task_object.outcome == task_object.OUTCOME_SUCCESS and show_green:
return 'class=green' return 'class=green'
else: else:
return '' return ''