summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2014-02-13 13:36:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-09 12:23:57 -0700
commit7008a24792704b8e757c583663636addf49f397d (patch)
tree85af5fc40963aabf6f243242da761fe6ad94a14e
parent4ae598195b60ea5a4c0a3efaded679208e1cc07e (diff)
downloadpoky-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>
-rw-r--r--bitbake/lib/toaster/orm/models.py5
-rw-r--r--bitbake/lib/toaster/toastergui/templates/recipe.html6
-rw-r--r--bitbake/lib/toaster/toastergui/templates/tasks.html8
3 files changed, 7 insertions, 12 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index c77df2243e..f96da9c339 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -116,6 +116,11 @@ class Task(models.Model):
116 def get_related_setscene(self): 116 def get_related_setscene(self):
117 return Task.objects.related_setscene(self) 117 return Task.objects.related_setscene(self)
118 118
119 def get_executed_display(self):
120 if self.task_executed:
121 return "Executed"
122 return "Not Executed"
123
119 build = models.ForeignKey(Build, related_name='task_build') 124 build = models.ForeignKey(Build, related_name='task_build')
120 order = models.IntegerField(null=True) 125 order = models.IntegerField(null=True)
121 task_executed = models.BooleanField(default=False) # True means Executed, False means Not/Executed 126 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 eba15baad3..1adb012189 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipe.html
@@ -115,11 +115,7 @@
115 <i class="icon-question-sign get-help hover-help" title="This task fetches the source code"></i> 115 <i class="icon-question-sign get-help hover-help" title="This task fetches the source code"></i>
116 </td> 116 </td>
117 117
118 {% if task.task_executed %} 118 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_executed_display}}</a></td>
119 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">Executed</a></td>
120 {% else %}
121 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">Prebuilt</a></td>
122 {% endif %}
123 119
124 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}}</a></td> 120 <td><a {{ task|task_color }} href="{% url "task" build.pk task.pk %}">{{task.get_outcome_display}}</a></td>
125 <td> 121 <td>
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html
index 6831f106c0..3479e7e1e7 100644
--- a/bitbake/lib/toaster/toastergui/templates/tasks.html
+++ b/bitbake/lib/toaster/toastergui/templates/tasks.html
@@ -30,13 +30,7 @@
30 <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> 30 <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a>
31 </td> 31 </td>
32 <td class="executed"> 32 <td class="executed">
33 <a href="{%url "task" build.pk task.pk%} "> 33 <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a>
34 {% if task.task_executed %}
35 Executed
36 {% else %}
37 Not executed
38 {% endif %}
39 </a>
40 </td> 34 </td>
41 <td class="outcome"> 35 <td class="outcome">
42 <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a> 36 <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a>