diff --git a/src/main/scala/gitbucket/core/controller/WikiController.scala b/src/main/scala/gitbucket/core/controller/WikiController.scala index caeac7c..6ced0fa 100644 --- a/src/main/scala/gitbucket/core/controller/WikiController.scala +++ b/src/main/scala/gitbucket/core/controller/WikiController.scala @@ -250,17 +250,26 @@ if (isEditable(repository)) { val pageName = StringUtil.urlDecode(params("page")) - defining(context.loginAccount.get) { loginAccount => - val deleteWikiInfo = DeleteWikiInfo( - repository.owner, - repository.name, - loginAccount.userName, - pageName - ) - recordActivity(deleteWikiInfo) - updateLastActivityDate(repository.owner, repository.name) + defining(context.loginAccount.get) { + loginAccount => + deleteWikiPage( + repository.owner, + repository.name, + pageName, + loginAccount.fullName, + loginAccount.mailAddress, + s"Destroyed ${pageName}" + ) + val deleteWikiInfo = DeleteWikiInfo( + repository.owner, + repository.name, + loginAccount.userName, + pageName + ) + recordActivity(deleteWikiInfo) + updateLastActivityDate(repository.owner, repository.name) - redirect(s"/${repository.owner}/${repository.name}/wiki") + redirect(s"/${repository.owner}/${repository.name}/wiki") } } else Unauthorized() }) diff --git a/src/main/twirl/gitbucket/core/helper/activities.scala.html b/src/main/twirl/gitbucket/core/helper/activities.scala.html index 8a9dfdf..26fdd70 100644 --- a/src/main/twirl/gitbucket/core/helper/activities.scala.html +++ b/src/main/twirl/gitbucket/core/helper/activities.scala.html @@ -58,6 +58,7 @@ } } + case "delete_wiki" => simpleActivity(activity) }) }