sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: importlayer Update property names for importlayer api calls 

Update the property names used in checking for existing layers. The
server side API changed but not all references were updated.

[YOCTO #8300]

(Bitbake rev: 1cbf0cf77a638257e18066f911fe4c4e13c278c6)

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:
Ed Bartosh 2015-10-14 14:10:10 +03:00 committed by Richard Purdie
parent 556c0ea92e
commit 2f52ef4b2f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bitbake/lib/toaster/toastergui/static/js/importlayer.js
View File

@ -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.layer__vcs_url);
dupLayerInfo.find("#dup-layer-revision").text(layer.revision.commit);
dupLayerInfo.find("#dup-layer-vcs-url").text(layer.vcs_url);
dupLayerInfo.find("#dup-layer-revision").text(layer.vcs_reference);
$(".fields-apart-from-layer-name").fadeOut(function(){
@ -214,11 +214,10 @@ function importLayerPageInit (ctx) {
$.getJSON(libtoaster.ctx.layersTypeAheadUrl,
{ include_added: "true" , search: name, format: "json" },
function(layer) {
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]);
if (layer.results.length > 0) {
for (var i in layer.results){
if (layer.results[i].name == name) {
layerExistsError(layer.results[i]);
}
}
}