1 files changed, 21 insertions, 18 deletions

diff --git a/bitbake/lib/toaster/toastergui/static/js/base.js b/bitbake/lib/toaster/toastergui/static/js/base.js
index 667c5dff6c..c4c96c80e6 100644
--- a/bitbake/lib/toaster/toastergui/static/js/base.js
+++ b/bitbake/lib/toaster/toastergui/static/js/base.js
@@ -6,7 +6,7 @@ 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;
   }
@@ -18,17 +18,18 @@ function basePageInit (ctx) {
 
   newBuildButton.show().removeAttr("disabled");
 
-  _checkProjectBuildable();
+  _checkProjectBuildable()
   _setupNewBuildButton();
 
+  var currentProjectId = libtoaster.ctx.projectId;
 
   function _checkProjectBuildable(){
-    if (ctx.projectId === undefined)
+    if (currentProjectId == undefined)
       return;
 
-    libtoaster.getProjectInfo(ctx.projectInfoUrl, ctx.projectId,
+    libtoaster.getProjectInfo(ctx.projectInfoUrl, currentProjectId,
       function(data){
-        if (data.machine.name === undefined || data.layers.length === 0) {
+        if (data.machine.name == undefined || data.layers.length == 0) {
           /* we can't build anything with out a machine and some layers */
           $("#new-build-button #targets-form").hide();
           $("#new-build-button .alert").show();
@@ -51,18 +52,18 @@ function basePageInit (ctx) {
     /* If we don't have a current project then present the set project
      * form.
      */
-    if (ctx.projectId === undefined) {
+    if (currentProjectId == undefined) {
       $('#change-project-form').show();
       $('#project .icon-pencil').hide();
     }
 
-    libtoaster.makeTypeahead(newBuildTargetInput, ctx.xhrDataTypeaheadUrl, { type : "targets", project_id: ctx.projectId }, function(item){
+    libtoaster.makeTypeahead(newBuildTargetInput, { type : "targets", project_id: currentProjectId }, function(item){
         /* successfully selected a target */
         selectedTarget = item;
     });
 
 
-    libtoaster.makeTypeahead(newBuildProjectInput, ctx.xhrDataTypeaheadUrl, { type : "projects" }, function(item){
+    libtoaster.makeTypeahead(newBuildProjectInput, { type : "projects" }, function(item){
         /* successfully selected a project */
         newBuildProjectSaveBtn.removeAttr("disabled");
         selectedProject = item;
@@ -72,13 +73,13 @@ function basePageInit (ctx) {
      * the value that has been set by selecting a suggestion from the typeahead
      */
     newBuildProjectInput.on('input', function(event) {
-        if (event.keyCode === 13)
+        if (event.keyCode == 13)
           return;
         newBuildProjectSaveBtn.attr("disabled", "disabled");
     });
 
     newBuildTargetInput.on('input', function() {
-      if ($(this).val().length === 0)
+      if ($(this).val().length == 0)
         newBuildTargetBuildBtn.attr("disabled", "disabled");
       else
         newBuildTargetBuildBtn.removeAttr("disabled");
@@ -88,21 +89,22 @@ function basePageInit (ctx) {
       if (!newBuildTargetInput.val())
         return;
 
-      var selectedTargetName = newBuildTargetInput.val();
+      if (!selectedTarget)
+        selectedTarget = { name: newBuildTargetInput.val() };
       /* fire and forget */
-      libtoaster.startABuild(ctx.projectBuildUrl, ctx.projectId, selectedTargetName, null, null);
-      window.location.replace(ctx.projectPageUrl+ctx.projectId);
+      libtoaster.startABuild(ctx.projectBuildUrl, currentProjectId, selectedTarget.name, null, null);
+      window.location.replace(ctx.projectBasePageUrl+currentProjectId);
     });
 
     newBuildProjectSaveBtn.click(function() {
-      ctx.projectId = selectedProject.id;
+      currentProjectId = selectedProject.id
       /* Update the typeahead project_id paramater */
       _checkProjectBuildable();
-      newBuildTargetInput.data('typeahead').options.xhrParams.project_id = ctx.projectId;
+      newBuildTargetInput.data('typeahead').options.xhrParams.project_id = currentProjectId;
       newBuildTargetInput.val("");
 
-      $("#new-build-button #project a").text(selectedProject.name).attr('href', ctx.projectPageUrl+ctx.projectId);
-      $("#new-build-button .alert a").attr('href', ctx.projectPageUrl+ctx.projectId);
+      $("#new-build-button #project a").text(selectedProject.name).attr('href', ctx.projectBasePageUrl+currentProjectId);
+      $("#new-build-button .alert a").attr('href', ctx.projectBasePageUrl+currentProjectId);
 
 
       $("#change-project-form").slideUp({ 'complete' : function() {
@@ -130,5 +132,6 @@ function basePageInit (ctx) {
     $(".new-build").click (function(event) {
       event.stopPropagation();
     });
-  }
+  };
+
 }