diff --git a/src/main/scala/gitbucket/core/controller/ReleasesController.scala b/src/main/scala/gitbucket/core/controller/ReleasesController.scala index ad827979b..6690e31b4 100644 --- a/src/main/scala/gitbucket/core/controller/ReleasesController.scala +++ b/src/main/scala/gitbucket/core/controller/ReleasesController.scala @@ -88,10 +88,9 @@ trait ReleaseControllerBase extends ControllerBase { redirect(s"/${release.userName}/${release.repositoryName}/releases/${release.releaseId}") }) - get("/:owner/:repository/release/delete/:id")(writableUsersOnly { repository => + ajaxPost("/:owner/:repository/releases/delete/:id")(writableUsersOnly { repository => deleteRelease(repository.owner, repository.name, params("id")) - - redirect(s"/${repository.owner}/${repository.name}/releases") + org.json4s.jackson.Serialization.write(Map("message" -> "ok")) }) ajaxPost("/:owner/:repository/releases/edit_title/:id", releaseTitleEditForm)(writableUsersOnly { (title, repository) => diff --git a/src/main/twirl/gitbucket/core/releases/release.scala.html b/src/main/twirl/gitbucket/core/releases/release.scala.html index 3cadc3a7f..e3504f5c8 100644 --- a/src/main/twirl/gitbucket/core/releases/release.scala.html +++ b/src/main/twirl/gitbucket/core/releases/release.scala.html @@ -125,13 +125,9 @@ $(function(){ }); $('#delete-release').click(function(){ if(confirm('Are you sure you want to delete this?')) { - var id = $(this).closest('a').data('comment-id'); - $.post('@helpers.url(repository)/issue_comments/delete/' + id, + $.post('@helpers.url(repository)/releases/delete/' + @release.releaseId, function(data){ - if(data > 0) { - $('#comment-' + id).prev('div.issue-avatar-image').remove(); - $('#comment-' + id).remove(); - } + location.href = "@helpers.url(repository)/releases"; }); } return false;