Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-07-07 01:27:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1548 from kounoike/pr-fix-1525

Browse Source 
Fix #1525 move attached directory when rename/transfer repo.
This commit is contained in:
Naoki Takezoe
2017-04-20 11:21:33 +09:00
committed by GitHub
parent 95b1945bc1 788e56d926
commit 1e94b69a68
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
View File

@@ -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))