diff options
-rw-r--r-- | lib/toaster/toastergui/api.py | 2 | ||||
-rw-r--r-- | lib/toaster/toastergui/static/js/layerdetails.js | 2 | ||||
-rw-r--r-- | lib/toaster/toastergui/static/js/libtoaster.js | 2 | ||||
-rw-r--r-- | lib/toaster/toastergui/templates/base.html | 2 | ||||
-rw-r--r-- | lib/toaster/toastergui/templates/basebuildpage.html | 6 |
5 files changed, 10 insertions, 4 deletions
diff --git a/lib/toaster/toastergui/api.py b/lib/toaster/toastergui/api.py index b01d4ba81..ae1f15077 100644 --- a/lib/toaster/toastergui/api.py +++ b/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/lib/toaster/toastergui/static/js/layerdetails.js b/lib/toaster/toastergui/static/js/layerdetails.js index 4c0d0426e..9ead393cb 100644 --- a/lib/toaster/toastergui/static/js/layerdetails.js +++ b/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 = $('<span>You have deleted <strong>1</strong> layer from your project: <strong id="deleted-layer-name"></strong>'); message.find("#deleted-layer-name").text(ctx.layerVersion.name); diff --git a/lib/toaster/toastergui/static/js/libtoaster.js b/lib/toaster/toastergui/static/js/libtoaster.js index 0832ba40c..86662b7a6 100644 --- a/lib/toaster/toastergui/static/js/libtoaster.js +++ b/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/lib/toaster/toastergui/templates/base.html b/lib/toaster/toastergui/templates/base.html index c1b1417a7..496dd6eab 100644 --- a/lib/toaster/toastergui/templates/base.html +++ b/lib/toaster/toastergui/templates/base.html @@ -74,7 +74,7 @@ </div> <div id="change-notification" class="alert alert-info alert-dismissible change-notification" style="display:none"> - <button type="button" class="close" id="hide-alert" data-dismiss="alert">×</button> + <button type="button" class="close" id="hide-alert" data-toggle="alert">×</button> <span id="change-notification-msg"></span> </div> diff --git a/lib/toaster/toastergui/templates/basebuildpage.html b/lib/toaster/toastergui/templates/basebuildpage.html index 0b6ef5638..f5eee9651 100644 --- a/lib/toaster/toastergui/templates/basebuildpage.html +++ b/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 @@ }); </script> - +<span style="display:none" id="deleted-build-message"> + You have deleted 1 build: <strong>{{build.get_sorted_target_list|field_values:"target"|join:", "}} {{build.machine}}</strong> completed on <strong>{{build.completed_on|date:"d/m/y H:i"}}</strong> +</span> <div class="modal fade" tabindex="-1" role="dialog" id="delete-build-modal" style="display: none;" data-backdrop="static" data-keyboard="false"> <div class="modal-dialog"> |