summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster
diff options
context:
space:
mode:
authorRavi Chintakunta <ravi.chintakunta@timesys.com>2014-03-18 15:17:31 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-01 10:22:42 +0100
commit85eb8dbd6dda9b1c4ebc0cfefff9bfc1daf18c0f (patch)
tree1c7f7d14fca65561aa20411f0e639652037fde3f /bitbake/lib/toaster
parent8f791ce59d5fb0b0bc502838c44bb597f80d3979 (diff)
downloadpoky-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.py7
-rw-r--r--bitbake/lib/toaster/toastergui/templates/recipe.html2
-rw-r--r--bitbake/lib/toaster/toastergui/templates/tasks.html2
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):
174 return "Executed" 174 return "Executed"
175 return "Not Executed" 175 return "Not Executed"
176 176
177 def get_description(self):
178 variable = Variable.objects.filter(variable_name=self.task_name, build = self.build)
179 try:
180 return variable[0].description
181 except IndexError:
182 return ''
183
177 build = models.ForeignKey(Build, related_name='task_build') 184 build = models.ForeignKey(Build, related_name='task_build')
178 order = models.IntegerField(null=True) 185 order = models.IntegerField(null=True)
179 task_executed = models.BooleanField(default=False) # True means Executed, False means Not/Executed 186 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 @@
112 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.order}}</a></td> 112 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.order}}</a></td>
113 <td> 113 <td>
114 <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.task_name}}</a> 114 <a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.task_name}}</a>
115 <i class="icon-question-sign get-help hover-help" title="This task fetches the source code"></i> 115 {% if task.get_description %}<i class="icon-question-sign get-help hover-help" title="" data-original-title="{{task.get_description}}"></i> {% endif %}
116 </td> 116 </td>
117 117
118 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_executed_display}}</a></td> 118 <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 @@
86 <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a> 86 <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a>
87 </td> 87 </td>
88 <td class="task_name"> 88 <td class="task_name">
89 <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> 89 <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 %}
90 </td> 90 </td>
91 <td class="executed"> 91 <td class="executed">
92 <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a> 92 <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a>