From 788e56d9260800d49ab471fe110e99d5a4365bb9 Mon Sep 17 00:00:00 2001 From: KOUNOIKE Yuusuke Date: Wed, 19 Apr 2017 20:46:52 +0900 Subject: [PATCH] Fix #1525 move attached directory when rename/transfer repo. --- .../controller/RepositorySettingsController.scala | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala index c6f580f9e..dc40df692 100644 --- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala @@ -139,6 +139,12 @@ trait RepositorySettingsControllerBase extends ControllerBase { FileUtils.moveDirectory(dir, getLfsDir(repository.owner, form.repositoryName)) } } + // Move attached directory + defining(getAttachedDir(repository.owner, repository.name)){ dir => + if(dir.isDirectory) { + FileUtils.moveDirectory(dir, getAttachedDir(repository.owner, form.repositoryName)) + } + } // Delete parent directory FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name)) @@ -352,6 +358,12 @@ trait RepositorySettingsControllerBase extends ControllerBase { FileUtils.moveDirectory(dir, getLfsDir(form.newOwner, repository.name)) } } + // Move attached directory + defining(getAttachedDir(repository.owner, repository.name)){ dir => + if(dir.isDirectory) { + FileUtils.moveDirectory(dir, getAttachedDir(form.newOwner, repository.name)) + } + } // Delere parent directory FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(repository.owner, repository.name))