summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-10-16 10:18:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-16 14:07:49 +0100
commitf44b34833f164daf34c57703429ed8f122888037 (patch)
tree2a18ace6dad3a137a28a18c3d365fd319995f1a4
parent643c42069a2788e9f40fa1bc9845f32aed3d096c (diff)
downloadbitbake-f44b34833f164daf34c57703429ed8f122888037.tar.gz
toaster: Allow any text input to machine configuration variable
Allow any text input to the machine variable; as we may not have discovered all the available machines until after a build. [YOCTO #8418] 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>
-rw-r--r--lib/toaster/toastergui/static/js/projectpage.js20
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/toaster/toastergui/static/js/projectpage.js b/lib/toaster/toastergui/static/js/projectpage.js
index b0fe4510a..e742ef291 100644
--- a/lib/toaster/toastergui/static/js/projectpage.js
+++ b/lib/toaster/toastergui/static/js/projectpage.js
@@ -23,7 +23,7 @@ function projectPageInit(ctx) {
var cancelReleaseChange = $("#cancel-release-change");
var currentLayerAddSelection;
- var currentMachineAddSelection = {};
+ var currentMachineAddSelection = "";
var urlParams = libtoaster.parseUrlParams();
@@ -38,7 +38,7 @@ function projectPageInit(ctx) {
*/
if (urlParams.hasOwnProperty('setMachine') &&
urlParams.setMachine !== prjInfo.machine.name){
- currentMachineAddSelection.name = urlParams.setMachine;
+ machineChangeInput.val(urlParams.setMachine);
machineChangeBtn.click();
} else {
updateMachineName(prjInfo.machine.name);
@@ -254,29 +254,33 @@ function projectPageInit(ctx) {
}
libtoaster.makeTypeahead(machineChangeInput, libtoaster.ctx.machinesTypeAheadUrl, { }, function(item){
- currentMachineAddSelection = item;
+ currentMachineAddSelection = item.name;
machineChangeBtn.removeAttr("disabled");
});
machineChangeBtn.click(function(e){
e.preventDefault();
- if (currentMachineAddSelection.name === undefined)
+ /* We accept any value regardless of typeahead selection or not */
+ if (machineChangeInput.val().length === 0)
return;
- libtoaster.editCurrentProject({ machineName : currentMachineAddSelection.name },
+ currentMachineAddSelection = machineChangeInput.val();
+
+ libtoaster.editCurrentProject(
+ { machineName : currentMachineAddSelection },
function(){
/* Success machine changed */
- updateMachineName(currentMachineAddSelection.name);
+ updateMachineName(currentMachineAddSelection);
machineChangeCancel.click();
/* Show the alert message */
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);
},
function(){
/* Failed machine changed */
- console.log("failed to change machine");
+ console.warn("Failed to change machine");
});
});