diff options
| author |   Ravi Chintakunta <ravi.chintakunta@timesys.com> | 2014-03-18 15:17:31 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-01 10:22:42 +0100 |
| commit | 85eb8dbd6dda9b1c4ebc0cfefff9bfc1daf18c0f (patch) | |
| tree | 1c7f7d14fca65561aa20411f0e639652037fde3f /bitbake/lib/toaster | |
| parent | 8f791ce59d5fb0b0bc502838c44bb597f80d3979 (diff) | |
| download | openembedded-core-contrib-85eb8dbd6dda9b1c4ebc0cfefff9bfc1daf18c0f.tar.gz | |
bitbake: toaster: Display task description
Display task description as content of help bubble for a task.
[YOCTO #5748]
(Bitbake rev: 4ffc380d11cff4e1d32d2bf5fb6c7cda6f7e22e6)
Signed-off-by: Ravi Chintakunta <ravi.chintakunta@timesys.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
| -rw-r--r-- | bitbake/lib/toaster/orm/models.py | 7 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/recipe.html | 2 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/tasks.html | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 4975433acd..9c15ebf12b 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -174,6 +174,13 @@ class Task(models.Model): return "Executed" return "Not Executed" + def get_description(self): + variable = Variable.objects.filter(variable_name=self.task_name, build = self.build) + try: + return variable[0].description + except IndexError: + return '' + build = models.ForeignKey(Build, related_name='task_build') order = models.IntegerField(null=True) task_executed = models.BooleanField(default=False) # True means Executed, False means Not/Executed diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html b/bitbake/lib/toaster/toastergui/templates/recipe.html index e367077a01..b8898d2b9f 100644 --- a/bitbake/lib/toaster/toastergui/templates/recipe.html +++ b/bitbake/lib/toaster/toastergui/templates/recipe.html @@ -112,7 +112,7 @@ <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.order}}</a></td> <td> <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.task_name}}</a> - <i class="icon-question-sign get-help hover-help" title="This task fetches the source code"></i> + {% if task.get_description %}<i class="icon-question-sign get-help hover-help" title="" data-original-title="{{task.get_description}}"></i> {% endif %} </td> <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_executed_display}}</a></td> diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html index ca7e187f73..d68a31a24d 100644 --- a/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html @@ -86,7 +86,7 @@ <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a> </td> <td class="task_name"> - <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> + <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> {% if task.get_description %}<i class="icon-question-sign get-help hover-help" title="" data-original-title="{{task.get_description}}"></i> {% endif %} </td> <td class="executed"> <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a> |