Patchwork [bitbake-devel,5/8] toaster: Fix help text for task details outcome

login
register
mail settings
Submitter Alexandru DAMIAN
Date March 11, 2014, 3:49 p.m.
Message ID <f3001af0b73f103a5d37af180e8c4c54a6249e97.1394552757.git.alexandru.damian@intel.com>
Download mbox | patch
Permalink /patch/68405/
State New
Headers show

Comments

Alexandru DAMIAN - March 11, 2014, 3:49 p.m.
From: Belen Barros Pena <belen.barros.pena@intel.com>

Changes made to models.py and task.html to make sure the
help text for the task outcome is displayed.

[YOCTO #5917]

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
---
 lib/toaster/orm/models.py                  | 20 ++++++++++----------
 lib/toaster/toastergui/templates/task.html |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

Patch

diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py
index 6706da8..0646813 100644
--- a/lib/toaster/orm/models.py
+++ b/lib/toaster/orm/models.py
@@ -140,14 +140,14 @@  class Task(models.Model):
         (OUTCOME_EMPTY, 'Empty'),
     )
 
-    TASK_OUTCOME_HELP = {
-        OUTCOME_SUCCESS:'This task completed successfully',
-        OUTCOME_COVERED:'This task did not run because its output is provided by another task',
-        OUTCOME_CACHED:'This task restored output from the sstate-cache directory or mirrors',
-        OUTCOME_PREBUILT:'This task did not run because its outcome was reused from a previous build',
-        OUTCOME_FAILED:'This task did not complete',
-        OUTCOME_NA:''
-    }
+    TASK_OUTCOME_HELP = (
+        (OUTCOME_SUCCESS, 'This task completed successfully'),
+        (OUTCOME_COVERED, 'This task did not run because its output is provided by another task'),
+        (OUTCOME_CACHED, 'This task restored output from the sstate-cache directory or mirrors'),
+        (OUTCOME_PREBUILT, 'This task did not run because its outcome was reused from a previous build'),
+        (OUTCOME_FAILED, 'This task did not complete'),
+        (OUTCOME_NA, ''),
+    )
 
     search_allowed_fields = [ "recipe__name", "recipe__version", "task_name", "logfile" ]
 
@@ -156,8 +156,8 @@  class Task(models.Model):
     def get_related_setscene(self):
         return Task.objects.related_setscene(self)
 
-    def outcome_help(self):
-        return Task.TASK_OUTCOME_HELP[self.outcome]
+    def get_outcome_help(self):
+        return Task.TASK_OUTCOME_HELP[self.outcome][1]
 
     def get_executed_display(self):
         if self.task_executed:
diff --git a/lib/toaster/toastergui/templates/task.html b/lib/toaster/toastergui/templates/task.html
index c5d6176..a8bcb52 100644
--- a/lib/toaster/toastergui/templates/task.html
+++ b/lib/toaster/toastergui/templates/task.html
@@ -18,7 +18,7 @@ 
 {# Outcome section #}
 <h2 {{ task|task_color:True }}>
     {{task.get_outcome_display}}
-    <i class="icon-question-sign get-help heading-help" title="" data-original-title="{{task.outcome_help}}"></i>
+    <i class="icon-question-sign get-help heading-help" title="{{task.get_outcome_help}}"></i>
 </h2>
 {%if task.task_executed %}
     {# executed tasks outcome #}