mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: toaster: Allow any text input to machine configuration variable

Browse Source 
Allow any text input to the machine variable; as we may not have discovered
all the available machines until after a build.

[YOCTO #8418]

(Bitbake rev: f44b34833f164daf34c57703429ed8f122888037)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood
2015-10-16 10:18:29 +01:00
committed by Richard Purdie
parent 320d05ea9f
commit 5effe8f632
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/toaster/toastergui/static/js/projectpage.js
+12 -8
View File
@@ -23,7 +23,7 @@ function projectPageInit(ctx) {
var cancelReleaseChange = $("#cancel-release-change"); var cancelReleaseChange = $("#cancel-release-change");
var currentLayerAddSelection; var currentLayerAddSelection;
var currentMachineAddSelection = {}; var currentMachineAddSelection = "";
var urlParams = libtoaster.parseUrlParams(); var urlParams = libtoaster.parseUrlParams();
@@ -38,7 +38,7 @@ function projectPageInit(ctx) {
*/ */
if (urlParams.hasOwnProperty('setMachine') && if (urlParams.hasOwnProperty('setMachine') &&
urlParams.setMachine !== prjInfo.machine.name){ urlParams.setMachine !== prjInfo.machine.name){
currentMachineAddSelection.name = urlParams.setMachine; machineChangeInput.val(urlParams.setMachine);
machineChangeBtn.click(); machineChangeBtn.click();
} else { } else {
updateMachineName(prjInfo.machine.name); updateMachineName(prjInfo.machine.name);
@@ -254,29 +254,33 @@ function projectPageInit(ctx) {
} }
libtoaster.makeTypeahead(machineChangeInput, libtoaster.ctx.machinesTypeAheadUrl, { }, function(item){ libtoaster.makeTypeahead(machineChangeInput, libtoaster.ctx.machinesTypeAheadUrl, { }, function(item){
currentMachineAddSelection = item; currentMachineAddSelection = item.name;
machineChangeBtn.removeAttr("disabled"); machineChangeBtn.removeAttr("disabled");
}); });
machineChangeBtn.click(function(e){ machineChangeBtn.click(function(e){
e.preventDefault(); e.preventDefault();
if (currentMachineAddSelection.name === undefined) /* We accept any value regardless of typeahead selection or not */
if (machineChangeInput.val().length === 0)
return; return;
libtoaster.editCurrentProject({ machineName : currentMachineAddSelection.name }, currentMachineAddSelection = machineChangeInput.val();
libtoaster.editCurrentProject(
{ machineName : currentMachineAddSelection },
function(){ function(){
/* Success machine changed */ /* Success machine changed */
updateMachineName(currentMachineAddSelection.name); updateMachineName(currentMachineAddSelection);
machineChangeCancel.click(); machineChangeCancel.click();
/* Show the alert message */ /* Show the alert message */
var message = $('<span class="lead">You have changed the machine to: <strong><span id="notify-machine-name"></span></strong></span>'); var message = $('<span class="lead">You have changed the machine to: <strong><span id="notify-machine-name"></span></strong></span>');
message.find("#notify-machine-name").text(currentMachineAddSelection.name); message.find("#notify-machine-name").text(currentMachineAddSelection);
libtoaster.showChangeNotification(message); libtoaster.showChangeNotification(message);
}, },
function(){ function(){
/* Failed machine changed */ /* Failed machine changed */
console.log("failed to change machine"); console.warn("Failed to change machine");
}); });
}); });