From ddcebbd982d81dabf8cb1c89f60f9b876a23b58c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 13:32:44 -0400
Subject: [PATCH] Merged #149 "Repo creation with initial commit fails if user does not have an email address"

---
 src/main/java/com/gitblit/wicket/pages/RepositoryPage.java |   49 +++++++++++++++++++++++++++++--------------------
 1 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index a0c9ce0..253c4fe 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -108,7 +108,7 @@
 			error(MessageFormat.format(getString("gb.repositoryNotSpecifiedFor"), getPageName()), true);
 		}
 
-		if (!getRepositoryModel().hasCommits) {
+		if (!getRepositoryModel().hasCommits && getClass() != EmptyRepositoryPage.class) {
 			throw new RestartResponseException(EmptyRepositoryPage.class, params);
 		}
 
@@ -148,6 +148,16 @@
 			}
 		}
 
+		showAdmin = false;
+		if (app().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
+			boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
+			showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
+		} else {
+			showAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
+		}
+		isOwner = GitBlitWebSession.get().isLoggedIn()
+				&& (getRepositoryModel().isOwner(GitBlitWebSession.get().getUsername()));
+
 		// register the available navigation links for this page and user
 		List<NavLink> navLinks = registerNavLinks();
 
@@ -156,10 +166,10 @@
 		add(navigationPanel);
 
 		add(new ExternalLink("syndication", SyndicationServlet.asLink(getRequest()
-				.getRelativePathPrefixToContextRoot(), repositoryName, null, 0)));
+				.getRelativePathPrefixToContextRoot(), getRepositoryName(), null, 0)));
 
 		// add floating search form
-		SearchForm searchForm = new SearchForm("searchForm", repositoryName);
+		SearchForm searchForm = new SearchForm("searchForm", getRepositoryName());
 		add(searchForm);
 		searchForm.setTranslatedAttributes();
 
@@ -183,7 +193,7 @@
 	private List<NavLink> registerNavLinks() {
 		PageParameters params = null;
 		if (!StringUtils.isEmpty(repositoryName)) {
-			params = WicketUtils.newRepositoryParameter(repositoryName);
+			params = WicketUtils.newRepositoryParameter(getRepositoryName());
 		}
 		List<NavLink> navLinks = new ArrayList<NavLink>();
 
@@ -195,13 +205,18 @@
 			navLinks.add(new PageNavLink("gb.summary", SummaryPage.class, params));
 		} else {
 			navLinks.add(new PageNavLink("gb.summary", SummaryPage.class, params));
-//			pages.put("overview", new PageRegistration("gb.overview", OverviewPage.class, params));
+			//			pages.put("overview", new PageRegistration("gb.overview", OverviewPage.class, params));
 			navLinks.add(new PageNavLink("gb.reflog", ReflogPage.class, params));
 		}
+
+		if (!model.hasCommits) {
+			return navLinks;
+		}
+
 		navLinks.add(new PageNavLink("gb.commits", LogPage.class, params));
 		navLinks.add(new PageNavLink("gb.tree", TreePage.class, params));
 		if (app().tickets().isReady() && (app().tickets().isAcceptingNewTickets(model) || app().tickets().hasTickets(model))) {
-			PageParameters tParams = WicketUtils.newOpenTicketsParameter(repositoryName);
+			PageParameters tParams = WicketUtils.newOpenTicketsParameter(getRepositoryName());
 			navLinks.add(new PageNavLink("gb.tickets", TicketsPage.class, tParams));
 		}
 		navLinks.add(new PageNavLink("gb.docs", DocsPage.class, params, true));
@@ -214,7 +229,7 @@
 		// per-repository extra navlinks
 		if (JGitUtils.getPagesBranch(r) != null) {
 			ExternalNavLink pagesLink = new ExternalNavLink("gb.pages", PagesServlet.asLink(
-					getRequest().getRelativePathPrefixToContextRoot(), repositoryName, null), true);
+					getRequest().getRelativePathPrefixToContextRoot(), getRepositoryName(), null), true);
 			navLinks.add(pagesLink);
 		}
 
@@ -229,16 +244,6 @@
 			navLinks.addAll(ext.getNavLinks(user, model));
 		}
 
-		// Conditionally add edit link
-		showAdmin = false;
-		if (app().settings().getBoolean(Keys.web.authenticateAdminPages, true)) {
-			boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
-			showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
-		} else {
-			showAdmin = app().settings().getBoolean(Keys.web.allowAdministration, false);
-		}
-		isOwner = GitBlitWebSession.get().isLoggedIn()
-				&& (model.isOwner(GitBlitWebSession.get().getUsername()));
 		return navLinks;
 	}
 
@@ -311,7 +316,7 @@
 		}
 
 		// (un)star link allows a user to star a repository
-		if (user.isAuthenticated) {
+		if (user.isAuthenticated && model.hasCommits) {
 			PageParameters starParams = DeepCopier.copy(getPageParameters());
 			starParams.put(PARAM_STAR, !user.getPreferences().isStarredRepository(model.name));
 			String toggleStarUrl = getRequestCycle().urlFor(getClass(), starParams).toString();
@@ -338,7 +343,7 @@
 		} else {
 			String fork = app().repositories().getFork(user.username, model.name);
 			boolean hasFork = fork != null;
-			boolean canFork = user.canFork(model);
+			boolean canFork = user.canFork(model) && model.hasCommits;
 
 			if (hasFork || !canFork) {
 				// user not allowed to fork or fork already exists or repo forbids forking
@@ -415,6 +420,10 @@
 			m = model;
 		}
 		return m;
+	}
+
+	protected String getRepositoryName() {
+		return getRepositoryModel().name;
 	}
 
 	protected RevCommit getCommit() {
@@ -625,7 +634,7 @@
 			r = null;
 		}
 		// setup page header and footer
-		setupPage(repositoryName, "/ " + getPageName());
+		setupPage(getRepositoryName(), "/ " + getPageName());
 		super.onBeforeRender();
 	}
 

--
Gitblit v1.9.1