From: Michael Wood <michael.g.wood@intel.com>
Date: Thu, 14 May 2015 16:17:51 +0000 (+0100)
Subject: bitbake: toaster: Fix build button current project race
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5da543c7b5cd565eed285a5015b1cafdc71ddb83;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: toaster: Fix build button current project race

Make sure the current project value is set before we check to see if the
project is buildable. Also update the blacklist url patterns where we
aren't displaying the button.

[YOCTO #7739]

(Bitbake rev: e169ed5cf190af62586f3e1c6ed6db6120406e05)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/toaster/toastergui/static/js/base.js b/bitbake/lib/toaster/toastergui/static/js/base.js
index c4c96c80e6d..ccc23e0e606 100644
--- a/bitbake/lib/toaster/toastergui/static/js/base.js
+++ b/bitbake/lib/toaster/toastergui/static/js/base.js
@@ -6,11 +6,13 @@ function basePageInit (ctx) {
   /* Hide the button if we're on the project,newproject or importlyaer page
    * or if there are no projects yet defined
    */
-  if (ctx.numProjects == 0 || ctx.currentUrl.search('newproject|project/\\d/$|importlayer/$') > 0){
+  if (ctx.numProjects == 0 || ctx.currentUrl.search('newproject|project/\\d$|importlayer$') > 0){
       newBuildButton.hide();
       return;
   }
 
+  var currentProjectId = libtoaster.ctx.projectId;
+
   /* Hide the change project icon when there is only one project */
   if (ctx.numProjects == 1){
      $('#project .icon-pencil').hide(); 
@@ -21,7 +23,6 @@ function basePageInit (ctx) {
   _checkProjectBuildable()
   _setupNewBuildButton();
 
-  var currentProjectId = libtoaster.ctx.projectId;
 
   function _checkProjectBuildable(){
     if (currentProjectId == undefined)