1 files changed, 16 insertions, 3 deletions

diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js
index e2bc1ab607..15830dded5 100644
--- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js
+++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js
@@ -78,8 +78,14 @@ function importLayerPageInit (ctx) {
   });
 
   importAndAddBtn.click(function(){
+    /* This is a list of the names from layerDeps for the layer deps
+     * modal dialog body
+     */
+    var depNames = [];
+
     /* arrray of all layer dep ids includes parent and child deps */
     var allDeps = [];
+
     /* temporary object to use to do a reduce on the dependencies for each
      * layer dependency added
      */
@@ -96,6 +102,7 @@ function importLayerPageInit (ctx) {
           depDeps[layer.id] = layer;
         }
       }
+      depNames.push(layerDeps[key].name);
       allDeps.push(layerDeps[key].id);
     }
 
@@ -106,10 +113,14 @@ function importLayerPageInit (ctx) {
 
     if (depDepsArray.length > 0) {
       var layer = { name: layerNameInput.val(), url: "#", id: -1 };
-      show_layer_deps_modal(ctx.projectId, layer, depDepsArray, function(selected){
+      var title = "Layer";
+      var body = "<strong>"+layer.name+"</strong>'s dependencies ("+
+        depNames.join(", ")+"</span>) require some layers that are not added to your project. Select the ones you want to add:</p>";
+
+      show_layer_deps_modal(ctx.projectId, layer, depDepsArray, title, body, false, function(selected){
         /* Add the accepted dependencies to the allDeps array */
         if (selected.length > 0){
-          allDeps.concat (selected);
+          allDeps = allDeps.concat (selected);
         }
         import_and_add ();
       });
@@ -141,8 +152,10 @@ function importLayerPageInit (ctx) {
               show_error_message(data, layerData);
               console.log(data.error);
             } else {
+              layerData.layersAdded = data.layers_added;
               /* Success layer import now go to the project page */
-              window.location.replace(ctx.projectPageUrl+'#/layerimported='+layerData.name);
+              $.cookie('layer-imported-alert', JSON.stringify(layerData), { path: '/'});
+              window.location.replace(ctx.projectPageUrl+'#/layerimported');
             }
           },
           error: function (data) {