On 7 October 2015 at 10:25, Barros Pena, Belen <[email protected]> wrote:
> On 06/10/2015 18:26, "[email protected] on behalf of > Michael Wood" <[email protected] on behalf of > [email protected]> wrote: > > >Allow any text input to the machine variable; as we may not have > >discovered > >all the available machines until after a build. > Upstreamed and added to toaster-next. Elliot > > > >[YOCTO #8418] > > This works for me. I can now set any crazy string I want as my machine > (and also set machines for local projects). > > Thanks! > > Belén > > > > >Signed-off-by: Michael Wood <[email protected]> > >--- > > .../lib/toaster/toastergui/static/js/projectpage.js | 20 > >++++++++++++-------- > > 1 file changed, 12 insertions(+), 8 deletions(-) > > > >diff --git a/bitbake/lib/toaster/toastergui/static/js/projectpage.js > >b/bitbake/lib/toaster/toastergui/static/js/projectpage.js > >index d367047..95cef18 100644 > >--- a/bitbake/lib/toaster/toastergui/static/js/projectpage.js > >+++ b/bitbake/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); > >@@ -251,29 +251,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"); > > }); > > }); > > > >-- > >2.1.4 > > > >-- > >_______________________________________________ > >toaster mailing list > >[email protected] > >https://lists.yoctoproject.org/listinfo/toaster > > -- > _______________________________________________ > toaster mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/toaster > -- Elliot Smith Software Engineer Intel Open Source Technology Centre
-- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
