From be2b4239f688e9ab747c48a1fbb2b1233d97689c Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Fri, 31 Jul 2015 15:09:16 +0300 Subject: bitbake: toastergui: Fix Duplicate layer importlayer api calls As the JSON response changed the duplicate layer functionality wasn't wasn't working as the field names in the returned data changed. This patch brings the field names back in sync with the response. (Bitbake rev: bdea86ae8720ee5792a5617c6073d51922a224ff) Signed-off-by: Michael Wood Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/static/js/importlayer.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js index 03274c00f3..50bc4ddd7c 100644 --- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js +++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js @@ -195,8 +195,8 @@ function importLayerPageInit (ctx) { var dupLayerInfo = $("#duplicate-layer-info"); dupLayerInfo.find(".dup-layer-name").text(layer.name); dupLayerInfo.find(".dup-layer-link").attr("href", layer.layerdetailurl); - dupLayerInfo.find("#dup-layer-vcs-url").text(layer.giturl); - dupLayerInfo.find("#dup-layer-revision").text(layer.revision); + dupLayerInfo.find("#dup-layer-vcs-url").text(layer.layer__vcs_url); + dupLayerInfo.find("#dup-layer-revision").text(layer.revision.commit); $(".fields-apart-from-layer-name").fadeOut(function(){ @@ -214,11 +214,11 @@ function importLayerPageInit (ctx) { $.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]); + if (layer.rows.length > 0) { + for (var i in layer.rows){ + if (layer.rows[i].name == name) { + console.log(layer.rows[i]) + layerExistsError(layer.rows[i]); } } } -- cgit v1.2.3-54-g00ecf