diff options
| -rw-r--r-- | bitbake/lib/toaster/toastergui/api.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/layerdetails.js | 7 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/layerdetails.html | 9 |
3 files changed, 12 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/api.py b/bitbake/lib/toaster/toastergui/api.py index 149abf7a5b3..3a05d663832 100644 --- a/bitbake/lib/toaster/toastergui/api.py +++ b/bitbake/lib/toaster/toastergui/api.py @@ -221,7 +221,7 @@ class XhrLayer(View): return JsonResponse({ "error": "ok", - "redirect": reverse('project', args=(kwargs['pid'],)) + "gotoUrl": reverse('project', args=(kwargs['pid'],)) }) diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js index 8165bad5dd6..4c0d0426ebd 100644 --- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js +++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js @@ -391,7 +391,9 @@ function layerDetailsPageInit (ctx) { }); $("#layer-delete-confirmed").click(function(){ - $.cookie("layer-deleted", ctx.layerVersion.name, { path: '/'}); + + 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); $.ajax({ type: "DELETE", @@ -401,7 +403,8 @@ function layerDetailsPageInit (ctx) { if (data.error != "ok") { console.warn(data.error); } else { - window.location = data.redirect + "?notify=layer-deleted"; + libtoaster.setNotification("layer-deleted", message.html()); + window.location.replace(data.gotoUrl); } }, error: function(data) { diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 0594b551aaf..f1569bd6302 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html @@ -6,14 +6,16 @@ {% block title %} {{layerversion.layer.name}} - {{project.name}} - Toaster {% endblock %} {% block pagecontent %} -<div id="delete-layer-modal" class="modal fade" tabindex="-1" role="dialog"> +<div id="delete-layer-modal" class="modal fade" tabindex="-1" role="dialog" + data-keyboard="false" data-backdrop="static"> <div class="modal-dialog" role="document"> <div class="modal-content"> <div class="modal-body"> Are you sure you want to delete the <strong>{{layerversion.layer.name}}</strong> layer? </div> <div class="modal-footer"> - <button type="button" id="layer-delete-confirmed" class="btn btn-primary">Delete</button> + <button type="button" id="layer-delete-confirmed" class="btn + btn-primary">Delete layer</button> <button type="button" class="btn btn-default btn-link" data-dismiss="modal">Cancel</button> </div> </div> @@ -358,7 +360,8 @@ {# Only show delete link for imported layers #} {% if layerversion.layer_source == layer_source.TYPE_IMPORTED %} <i class="icon-trash text-danger"></i> - <a href="#delete-layer-modal" role="button" class="text-danger" data-toggle="modal" data-target="#delete-layer-modal">Delete {{layerversion.layer.name}}</a> + <a href="#delete-layer-modal" role="button" class="text-danger" + data-toggle="modal" data-target="#delete-layer-modal">Delete layer</a> {% endif %} </div> </div> |