Add confirm modal and api calls to delete a project from the project dashboard.
[YOCTO #6238] Signed-off-by: Michael Wood <[email protected]> --- bitbake/lib/toaster/toastergui/api.py | 7 ++++-- .../toaster/toastergui/static/js/projectpage.js | 18 ++++++++++++++- .../toastergui/templates/baseprojectpage.html | 6 +++++ .../lib/toaster/toastergui/templates/project.html | 27 +++++++++++----------- 4 files changed, 41 insertions(+), 17 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/api.py b/bitbake/lib/toaster/toastergui/api.py index 5589118..4fb078b 100644 --- a/bitbake/lib/toaster/toastergui/api.py +++ b/bitbake/lib/toaster/toastergui/api.py @@ -820,8 +820,11 @@ class XhrProject(View): def delete(self, request, *args, **kwargs): try: - Project.objects.get(kwargs['project_id']).delete() + Project.objects.get(pk=kwargs['project_id']).delete() except Project.DoesNotExist: return error_response("Project %s does not exist" % kwargs['project_id']) - return JsonResponse({"error": "ok"}) + return JsonResponse({ + "error": "ok", + "gotoUrl": reverse("all-projects", args=[]) + }) diff --git a/bitbake/lib/toaster/toastergui/static/js/projectpage.js b/bitbake/lib/toaster/toastergui/static/js/projectpage.js index 3bf3cba..d38389c 100644 --- a/bitbake/lib/toaster/toastergui/static/js/projectpage.js +++ b/bitbake/lib/toaster/toastergui/static/js/projectpage.js @@ -328,7 +328,23 @@ function projectPageInit(ctx) { $("#delete-project-confirmed").click(function(e){ e.preventDefault(); - + + $.ajax({ + type: 'DELETE', + url: libtoaster.ctx.xhrProjectUrl, + headers: { 'X-CSRFToken' : $.cookie('csrftoken')}, + success: function (data) { + if (data.error !== "ok") { + console.warn(data.error); + } else { + window.location.replace(data.gotoUrl); + } + }, + error: function (data) { + console.warn(data); + if (onfail) onfail(data); + } + }); }); } diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html index b3b6f1c..8427d25 100644 --- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html +++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html @@ -34,6 +34,12 @@ $(document).ready(function(){ <li><a href="{% url 'projectlayers' project.id %}">Layers</a></li> <li class="nav-header">Extra configuration</li> <li><a href="{% url 'projectconf' project.id %}">BitBake variables</a></li> + + <li class="nav-header">Actions</li> + <li> + <a href="#delete-project-modal" role="button" class="text-danger" data-toggle="modal" data-target="#delete-project-modal"> + <i class="icon-trash text-danger"></i> Delete project</a> + </li> </ul> </div> <div class="col-md-10"> diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index ff9eab7..d932c56 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html @@ -24,30 +24,29 @@ }); </script> -{% comment %} -<!-- Comment out the ability to change the project release, until we decide what to do this functionality --> -<div id="change-release-modal" class="modal hide fade in" tabindex="-1" role="dialog" aria-labelledby="change-release-modal" aria-hidden="false"> +<div id="delete-project-modal" class="modal fade" tabindex="-1" role="dialog"> <div class="modal-dialog"> <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> - <h3>Changing Yocto Project release to <span class="proposed-release-change-name"></span></h3> + <h4>Are you sure you want to delete this project?</h4> </div> <div class="modal-body"> - <p>The following added layers do not exist for <span class="proposed-release-change-name"></span>: </p> - <ul id="layers-to-remove-list"> - </ul> - <p>If you change the Yocto Project release to <span class="proposed-release-change-name"></span>, the above layers will be deleted from your added layers.</p> + <p>Deleting the <strong>A Toaster project</strong> project will remove forever:</p> + <ul> + <li>Its configuration information</li> + <li>Its imported layers</li> + <li>Its custom images</li> + <li>All its build information</li> + </ul> </div> <div class="modal-footer"> - <button id="change-release-and-rm-layers" data-dismiss="modal" type="submit" class="btn btn-primary">Change release and delete layers</button> - <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button> + <button type="button" class="btn btn-primary" id="delete-project-confirmed">Delete project</button> + <button type="button" class="btn btn-link" data-dismiss="modal">Cancel</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> -</div><!-- /.modal --> -{% endcomment %} +</div> + <div class="row" id="project-page" style="display:none"> <div class="col-md-6"> -- 2.7.4 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
