diff options
| author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-02-13 13:36:54 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-09 12:23:57 -0700 |
| commit | 7008a24792704b8e757c583663636addf49f397d (patch) | |
| tree | 85af5fc40963aabf6f243242da761fe6ad94a14e /bitbake/lib/toaster/toastergui/templates | |
| parent | 4ae598195b60ea5a4c0a3efaded679208e1cc07e (diff) | |
| download | ast2050-yocto-poky-7008a24792704b8e757c583663636addf49f397d.zip ast2050-yocto-poky-7008a24792704b8e757c583663636addf49f397d.tar.gz | |
bitbake: toastergui: fix task executed status display
The proper way to get a display-able value
in Django is to use a model method instead of clutter
the template with if/else.
[YOCTO #5641]
(Bitbake rev: bb21b71dab70db163b804c7ebf27b85c59a39112)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/recipe.html | 6 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/tasks.html | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/bitbake/lib/toaster/toastergui/templates/recipe.html index eba15ba..1adb012 100644 --- a/bitbake/lib/toaster/toastergui/templates/recipe.html +++ b/bitbake/lib/toaster/toastergui/templates/recipe.html @@ -115,11 +115,7 @@ <i class="icon-question-sign get-help hover-help" title="This task fetches the source code"></i> </td> - {% if task.task_executed %} - <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">Executed</a></td> - {% else %} - <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">Prebuilt</a></td> - {% endif %} + <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_executed_display}}</a></td> <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}}</a></td> <td> diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html index 6831f10..3479e7e 100644 --- a/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html @@ -30,13 +30,7 @@ <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> </td> <td class="executed"> - <a href="{%url "task" build.pk task.pk%} "> - {% if task.task_executed %} - Executed - {% else %} - Not executed - {% endif %} - </a> + <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a> </td> <td class="outcome"> <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a> |
