From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index 41f109a..72d1e1a 100644
--- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -15,7 +15,6 @@
*/
package com.gitblit.wicket.pages;
-import java.text.MessageFormat;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -24,7 +23,6 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.protocol.http.WebRequest;
-import com.gitblit.GitBlit;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.RepositoryUrl;
import com.gitblit.models.UserModel;
@@ -33,7 +31,7 @@
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.RepositoryUrlPanel;
-public class EmptyRepositoryPage extends RootPage {
+public class EmptyRepositoryPage extends RepositoryPage {
public EmptyRepositoryPage(PageParameters params) {
super(params);
@@ -41,36 +39,37 @@
setVersioned(false);
String repositoryName = WicketUtils.getRepositoryName(params);
- RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName);
+ RepositoryModel repository = app().repositories().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 GitblitRedirectException(SummaryPage.class, params);
}
-
- setupPage(repositoryName, getString("gb.emptyRepository"));
UserModel user = GitBlitWebSession.get().getUser();
if (user == null) {
user = UserModel.ANONYMOUS;
}
-
+
HttpServletRequest req = ((WebRequest) getRequest()).getHttpServletRequest();
- List<RepositoryUrl> repositoryUrls = GitBlit.self().getRepositoryUrls(req, user, repository);
+ List<RepositoryUrl> repositoryUrls = app().services().getRepositoryUrls(req, user, repository);
RepositoryUrl primaryUrl = repositoryUrls.size() == 0 ? null : repositoryUrls.get(0);
String url = primaryUrl != null ? primaryUrl.url : "";
-
+
+ String createSyntax = readResource("create_git.md").replace("${primaryUrl}", url);
+ String existingSyntax = readResource("existing_git.md").replace("${primaryUrl}", url);
+
add(new Label("repository", repositoryName));
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)));
+ add(new Label("createSyntax", createSyntax));
+ add(new Label("existingSyntax", existingSyntax));
}
-
+
@Override
- protected Class<? extends BasePage> getRootNavPageClass() {
- return RepositoriesPage.class;
+ protected String getPageName() {
+ return getString("gb.summary");
}
}
--
Gitblit v1.9.1