From b4ed66fda03d83fd281ca9cbeae0a1c7785489e4 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 9 May 2014 07:57:14 -0400 Subject: Move delete repository function into the edit page --- .../java/com/gitblit/manager/RepositoryManager.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/main/java/com/gitblit/manager/RepositoryManager.java') diff --git a/src/main/java/com/gitblit/manager/RepositoryManager.java b/src/main/java/com/gitblit/manager/RepositoryManager.java index 7351eb97..c141f088 100644 --- a/src/main/java/com/gitblit/manager/RepositoryManager.java +++ b/src/main/java/com/gitblit/manager/RepositoryManager.java @@ -1532,6 +1532,17 @@ public class RepositoryManager implements IRepositoryManager { } } + /** + * Returns true if the repository can be deleted. + * + * @return true if the repository can be deleted + */ + @Override + public boolean canDelete(RepositoryModel repository) { + return settings.getBoolean(Keys.web.allowDeletingNonEmptyRepositories, true) + || !repository.hasCommits; + } + /** * Deletes the repository from the file system and removes the repository * permission from all repository users. @@ -1553,6 +1564,12 @@ public class RepositoryManager implements IRepositoryManager { */ @Override public boolean deleteRepository(String repositoryName) { + RepositoryModel repository = getRepositoryModel(repositoryName); + if (!canDelete(repository)) { + logger.warn("Attempt to delete {} rejected!", repositoryName); + return false; + } + try { close(repositoryName); // clear the repository cache -- cgit v1.2.3