1 files changed, 16 insertions, 12 deletions

diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js
index e9d7ae8ef2..df48e84876 100644
--- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js
+++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js
@@ -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() {