[gnome-continuous-yocto/gnomeostree-3.28-rocko: 261/8267] bitbake: toaster: fix progress bar in MySQL environment

[Emmanuele Bassi <ebassi src gnome org>]

commit 3d11229aa14c0a034acc9e1ae040d80eeca9edd1
Author: Elliot Smith <elliot smith intel com>
Date:   Fri May 13 17:02:58 2016 +0100

    bitbake: toaster: fix progress bar in MySQL environment
    
    When using MySQL, the project builds info delivered by MySQL
    differs from that delivered by SQLite: the former returns text
    values from the enumeration for Build outcomes, while the latter
    returns the integer value. This causes the progress bar JS to
    break, as it is expecting outcome strings.
    
    Modify the recent_build() method to include an outcomeText property
    for each Build object, then use this in the conditionals in the
    progress bar JS.
    
    [YOCTO #9498]
    
    (Bitbake rev: 7ac374adf1cc70173ff6cc492bc078bba1cf500b)
    
    Signed-off-by: Elliot Smith <elliot smith intel com>
    Signed-off-by: Michael Wood <michael g wood intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/toaster/orm/models.py                  |    1 +
 .../lib/toaster/toastergui/static/js/mrbsection.js |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 2669606..88967a2 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -416,6 +416,7 @@ class Build(models.Model):
         # to show build progress in mrb_section.html
         for build in recent_builds:
             build.percentDone = build.completeper()
+            build.outcomeText = build.get_outcome_text()
 
         return recent_builds
 
diff --git a/bitbake/lib/toaster/toastergui/static/js/mrbsection.js 
b/bitbake/lib/toaster/toastergui/static/js/mrbsection.js
index 09117e1..9a76ee6 100644
--- a/bitbake/lib/toaster/toastergui/static/js/mrbsection.js
+++ b/bitbake/lib/toaster/toastergui/static/js/mrbsection.js
@@ -57,12 +57,12 @@ function mrbSectionInit(ctx){
           for (var i in prjInfo.builds){
             var build = prjInfo.builds[i];
 
-            if (build.outcome === "In Progress" ||
+            if (build.outcomeText === "In Progress" ||
                $(".progress .bar").length > 0){
               /* Update the build progress */
               var percentDone;
 
-              if (build.outcome !== "In Progress"){
+              if (build.outcomeText !== "In Progress"){
                 /* We have to ignore the value when it's Succeeded because it
                 *   goes back to 0
                 */