diff --git a/bitbake/lib/toaster/toastergui/api.py b/bitbake/lib/toaster/toastergui/api.py index b01d4ba815..ae1f150770 100644 --- a/bitbake/lib/toaster/toastergui/api.py +++ b/bitbake/lib/toaster/toastergui/api.py @@ -224,7 +224,7 @@ class XhrLayer(View): return JsonResponse({ "error": "ok", - "gotoUrl": reverse('project', args=(kwargs['pid'],)) + "gotoUrl": reverse('projectlayers', args=(kwargs['pid'],)) }) diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js index 4c0d0426eb..9ead393cbf 100644 --- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js +++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js @@ -392,6 +392,8 @@ function layerDetailsPageInit (ctx) { $("#layer-delete-confirmed").click(function(){ + $("#delete-layer-modal button[data-dismiss='modal']").hide(); + var message = $('You have deleted 1 layer from your project: '); message.find("#deleted-layer-name").text(ctx.layerVersion.name); diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js index 0832ba40c3..86662b7a68 100644 --- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js +++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js @@ -342,7 +342,7 @@ var libtoaster = (function () { } function _showChangeNotification(message){ - $(".alert").fadeOut().promise().done(function(){ + $(".alert-dismissible").fadeOut().promise().done(function(){ var alertMsg = $("#change-notification-msg"); alertMsg.html(message); diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index c1b1417a76..496dd6eab8 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html @@ -74,7 +74,7 @@ diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index 0b6ef56380..f5eee96516 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html @@ -28,6 +28,8 @@ if (data.error !== "ok") { console.warn(data.error); } else { + libtoaster.setNotification("build-deleted", + $("#deleted-build-message").html()); window.location.replace(data.gotoUrl); } }, @@ -61,7 +63,9 @@ }); - +