From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 25 Feb 2013 08:40:30 -0500 Subject: [PATCH] Merge pull request #75 from thefake/master --- src/com/gitblit/wicket/pages/EmptyRepositoryPage.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java index e21d616..be0dad9 100644 --- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java +++ b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java @@ -20,13 +20,13 @@ import java.util.List; import org.apache.wicket.PageParameters; -import org.apache.wicket.RedirectException; import org.apache.wicket.markup.html.basic.Label; import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.RepositoryModel; import com.gitblit.utils.ArrayUtils; +import com.gitblit.wicket.GitblitRedirectException; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.RepositoryUrlPanel; @@ -35,12 +35,17 @@ public EmptyRepositoryPage(PageParameters params) { super(params); + setVersioned(false); + String repositoryName = WicketUtils.getRepositoryName(params); RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName); + if (repository == null) { + error(getString("gb.canNotLoadRepository") + " " + repositoryName, true); + } if (repository.hasCommits) { // redirect to the summary page if this repository is not empty - throw new RedirectException(SummaryPage.class, params); + throw new GitblitRedirectException(SummaryPage.class, params); } setupPage(repositoryName, getString("gb.emptyRepository")); -- Gitblit v1.9.1