From 4fcac9d2cbdafb51e3ee9ca3b3da64fd86103174 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 26 Nov 2013 15:58:15 -0500
Subject: [PATCH] Remove artifact setting from manager dialog
---
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index be0dad9..4e05fad 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -16,16 +16,19 @@
package com.gitblit.wicket.pages;
import java.text.MessageFormat;
-import java.util.ArrayList;
import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.protocol.http.WebRequest;
import com.gitblit.GitBlit;
-import com.gitblit.Keys;
import com.gitblit.models.RepositoryModel;
-import com.gitblit.utils.ArrayUtils;
+import com.gitblit.models.RepositoryUrl;
+import com.gitblit.models.UserModel;
+import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.GitblitRedirectException;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.RepositoryUrlPanel;
@@ -42,26 +45,32 @@
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 GitblitRedirectException(SummaryPage.class, params);
}
-
+
setupPage(repositoryName, getString("gb.emptyRepository"));
- List<String> repositoryUrls = new ArrayList<String>();
-
- if (GitBlit.getBoolean(Keys.git.enableGitServlet, true)) {
- // add the Gitblit repository url
- repositoryUrls.add(getRepositoryUrl(repository));
+ UserModel user = GitBlitWebSession.get().getUser();
+ if (user == null) {
+ user = UserModel.ANONYMOUS;
}
- repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName));
-
- String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.get(0);
+
+ HttpServletRequest req = ((WebRequest) getRequest()).getHttpServletRequest();
+ List<RepositoryUrl> repositoryUrls = GitBlit.self().getRepositoryUrls(req, user, repository);
+ RepositoryUrl primaryUrl = repositoryUrls.size() == 0 ? null : repositoryUrls.get(0);
+ String url = primaryUrl != null ? primaryUrl.url : "";
+
add(new Label("repository", repositoryName));
- add(new RepositoryUrlPanel("pushurl", primaryUrl));
- add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", repositoryUrls.get(0))));
- add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", primaryUrl)));
+ add(new RepositoryUrlPanel("pushurl", false, user, repository));
+ add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", url)));
+ add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", url)));
+ }
+
+ @Override
+ protected Class<? extends BasePage> getRootNavPageClass() {
+ return RepositoriesPage.class;
}
}
--
Gitblit v1.9.1