From f97bf09263fe8ef7ba4dcf231dfe7b8265b1e0df Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 27 Apr 2011 21:22:12 -0400
Subject: [PATCH] Centralized markdown transforms. Moved config ops to GitBlit.
---
src/com/gitblit/wicket/RepositoryPage.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/wicket/RepositoryPage.java b/src/com/gitblit/wicket/RepositoryPage.java
index 28cdcd0..ba3ca69 100644
--- a/src/com/gitblit/wicket/RepositoryPage.java
+++ b/src/com/gitblit/wicket/RepositoryPage.java
@@ -31,6 +31,7 @@
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.JGitUtils.SearchType;
import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.models.RepositoryModel;
import com.gitblit.wicket.pages.BranchesPage;
import com.gitblit.wicket.pages.DocsPage;
import com.gitblit.wicket.pages.LogPage;
@@ -45,10 +46,11 @@
public abstract class RepositoryPage extends BasePage {
protected final String repositoryName;
- protected final String objectId;
- protected String description;
+ protected final String objectId;
private transient Repository r = null;
+
+ private RepositoryModel m = null;
private final Logger logger = LoggerFactory.getLogger(RepositoryPage.class);
@@ -88,14 +90,12 @@
List<String> extraPageLinks = new ArrayList<String>();
// Conditionally add tickets page
- boolean checkTickets = JGitUtils.getRepositoryUseTickets(r);
- if (checkTickets && JGitUtils.getTicketsBranch(r) != null) {
+ if (getRepositoryModel().useTickets && JGitUtils.getTicketsBranch(r) != null) {
extraPageLinks.add("tickets");
}
// Conditionally add docs page
- boolean checkDocs = JGitUtils.getRepositoryUseDocs(r);
- if (checkDocs) {
+ if (getRepositoryModel().useDocs) {
extraPageLinks.add("docs");
}
@@ -150,11 +150,17 @@
redirectToInterceptPage(new RepositoriesPage());
return null;
}
- description = JGitUtils.getRepositoryDescription(r);
this.r = r;
}
return r;
}
+
+ protected RepositoryModel getRepositoryModel() {
+ if (m == null) {
+ m = GitBlit.self().getRepositoryModel(repositoryName);
+ }
+ return m;
+ }
protected void addRefs(Repository r, RevCommit c) {
add(new RefsPanel("refsPanel", repositoryName, c, JGitUtils.getAllRefs(r)));
--
Gitblit v1.9.1