mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: toastergui: importlayer Add format type to JSON calls

Browse Source 
After API was changed we now need to pass the parameter "format=json" as
a get parameter when requesting a json payload. Otherwise we get the
html version of the page instead of the data we need.

(Bitbake rev: 4545c21b70998bd240c3a21de05e8d4642044119)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood
2015-07-31 15:09:05 +03:00
committed by Richard Purdie
parent d826d4e800
commit dd8c78b07a
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/toaster/toastergui/static/js/importlayer.js
+16 -12
View File
@@ -28,9 +28,11 @@ function importLayerPageInit (ctx) {
/* We automatically add "openembedded-core" layer for convenience as a
* dependency as pretty much all layers depend on this one
*/
$.getJSON(libtoaster.ctx.projectLayersUrl, { include_added: "true" , search: "openembedded-core" }, function(layer) {
if (layer.list.length == 1) {
currentLayerDepSelection = layer.list[0];
$.getJSON(libtoaster.ctx.projectLayersUrl,
{ include_added: "true" , search: "openembedded-core", format: "json" },
function(layer) {
if (layer.rows.length > 0) {
currentLayerDepSelection = layer.rows[0];
layerDepBtn.click();
}
});
@@ -211,16 +213,18 @@ function importLayerPageInit (ctx) {
var name = $(this).val();
/* Check if the layer name exists */
$.getJSON(libtoaster.ctx.projectLayersUrl, { include_added: "true" , search: name }, function(layer) {
if (layer.list.length > 0) {
for (var i in layer.list){
if (layer.list[i].name == name) {
console.log(layer.list[i])
layerExistsError(layer.list[i]);
$.getJSON(libtoaster.ctx.projectLayersUrl,
{ include_added: "true" , search: name, format: "json" },
function(layer) {
if (layer.list.length > 0) {
for (var i in layer.list){
if (layer.list[i].name == name) {
console.log(layer.list[i])
layerExistsError(layer.list[i]);
}
}
}
}
}
});
});
});
vcsURLInput.on('input', function() {