From fdf210292312590df4b0e19e3a6fc0b687dd2797 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 25 May 2015 22:03:40 +0900 Subject: [PATCH] (refs #763)Don't remove disabled user's data and repositories. --- .../core/controller/AccountController.scala | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index 29c89f038..594f6ef91 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -202,15 +202,15 @@ trait AccountControllerBase extends AccountManagementControllerBase { val userName = params("userName") getAccountByUserName(userName, true).foreach { account => - // Remove repositories - getRepositoryNamesOfUser(userName).foreach { repositoryName => - deleteRepository(userName, repositoryName) - FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName)) - FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName)) - FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName)) - } - // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY - removeUserRelatedData(userName) +// // Remove repositories +// getRepositoryNamesOfUser(userName).foreach { repositoryName => +// deleteRepository(userName, repositoryName) +// FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName)) +// FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName)) +// FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName)) +// } +// // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY +// removeUserRelatedData(userName) updateAccount(account.copy(isRemoved = true)) }