From 86bea9e0016b2890db8ba83049dd4e89653a0a5e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 16 Mar 2012 17:29:39 -0400
Subject: [PATCH] Ensure that the welcome message is interpreted as UTF-8 (issue 74)
---
src/com/gitblit/wicket/pages/EmptyRepositoryPage.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index 50695b9..133cdac 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -22,9 +22,10 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
-import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.models.RepositoryModel;
+import com.gitblit.utils.ArrayUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.RepositoryUrlPanel;
@@ -34,22 +35,21 @@
super(params);
String repositoryName = WicketUtils.getRepositoryName(params);
+ RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName);
setupPage(repositoryName, getString("gb.emptyRepository"));
List<String> repositoryUrls = new ArrayList<String>();
if (GitBlit.getBoolean(Keys.git.enableGitServlet, true)) {
- StringBuilder sb = new StringBuilder();
- sb.append(WicketUtils.getGitblitURL(getRequestCycle().getRequest()));
- sb.append(Constants.GIT_PATH);
- sb.append(repositoryName);
- repositoryUrls.add(sb.toString());
+ // add the Gitblit repository url
+ repositoryUrls.add(getRepositoryUrl(repository));
}
repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName));
+ String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.get(0);
add(new Label("repository", repositoryName));
- add(new RepositoryUrlPanel("pushurl", repositoryUrls.get(0)));
+ 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", repositoryUrls.get(0))));
+ add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", primaryUrl)));
}
}
--
Gitblit v1.9.1