From 961f6226fa8019a7492ee40fdba18c5916065001 Mon Sep 17 00:00:00 2001 From: David Reyna Date: Thu, 10 Apr 2014 21:43:11 -0700 Subject: bitbake: toaster: sort outcome and sstate columns by string value Sort the 'outcome' and 'sstate_result' columns by their description string values and not their numerical values. [YOCTO #5921] (Bitbake rev: eee0abe70e4d85a0753f0b122518d7a9f06181bc) Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/models.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'bitbake/lib/toaster/orm') diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index c344c66bee..22c66a9a28 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -166,9 +166,18 @@ class Task(models.Model): def get_related_setscene(self): return Task.objects.related_setscene(self) + def get_outcome_text(self): + return Task.TASK_OUTCOME[self.outcome + 1][1] + def get_outcome_help(self): return Task.TASK_OUTCOME_HELP[self.outcome][1] + def get_sstate_text(self): + if self.sstate_result==Task.SSTATE_NA: + return '' + else: + return Task.SSTATE_RESULT[self.sstate_result][1] + def get_executed_display(self): if self.task_executed: return "Executed" @@ -200,6 +209,9 @@ class Task(models.Model): message = models.CharField(max_length=240) logfile = models.FilePathField(max_length=255, blank=True) + outcome_text = property(get_outcome_text) + sstate_text = property(get_sstate_text) + class Meta: ordering = ('order', 'recipe' ,) unique_together = ('build', 'recipe', 'task_name', ) -- cgit v1.2.3-54-g00ecf