summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui/static/js/mrbsection.js
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2016-05-13 17:02:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 17:45:58 +0100
commit75ca53211488a3e268037a44ee2a7ac5c7181bd2 (patch)
tree3e12719bd29fe1f5526183ce849790bc341a9359 /bitbake/lib/toaster/toastergui/static/js/mrbsection.js
parent898a78357e72fb80f1f8e26ba90bad5b7b054a4f (diff)
downloadpoky-75ca53211488a3e268037a44ee2a7ac5c7181bd2.tar.gz
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: 9ea7d3ec59c2b09ae60cf0c7f18472355bfb98d7) 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>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/static/js/mrbsection.js')
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/mrbsection.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/mrbsection.js b/bitbake/lib/toaster/toastergui/static/js/mrbsection.js
index 09117e1daf..9a76ee6407 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){
57 for (var i in prjInfo.builds){ 57 for (var i in prjInfo.builds){
58 var build = prjInfo.builds[i]; 58 var build = prjInfo.builds[i];
59 59
60 if (build.outcome === "In Progress" || 60 if (build.outcomeText === "In Progress" ||
61 $(".progress .bar").length > 0){ 61 $(".progress .bar").length > 0){
62 /* Update the build progress */ 62 /* Update the build progress */
63 var percentDone; 63 var percentDone;
64 64
65 if (build.outcome !== "In Progress"){ 65 if (build.outcomeText !== "In Progress"){
66 /* We have to ignore the value when it's Succeeded because it 66 /* We have to ignore the value when it's Succeeded because it
67 * goes back to 0 67 * goes back to 0
68 */ 68 */