From 7203a415392b5372c0866991f1c2810eb5e3527a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 18 Apr 2011 17:50:31 -0400
Subject: [PATCH] Add search form to the page nav links panel within a repository.
---
src/com/gitblit/wicket/RepositoryPage.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/wicket/RepositoryPage.java b/src/com/gitblit/wicket/RepositoryPage.java
index 4e84938..6442bee 100644
--- a/src/com/gitblit/wicket/RepositoryPage.java
+++ b/src/com/gitblit/wicket/RepositoryPage.java
@@ -6,15 +6,24 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.gitblit.StoredSettings;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.JGitUtils.SearchType;
import com.gitblit.wicket.pages.RepositoriesPage;
+import com.gitblit.wicket.pages.SearchPage;
import com.gitblit.wicket.panels.PageLinksPanel;
import com.gitblit.wicket.panels.RefsPanel;
@@ -26,14 +35,16 @@
private transient Repository r = null;
+ private final Logger logger = LoggerFactory.getLogger(RepositoryPage.class);
+
public RepositoryPage(PageParameters params) {
super(params);
if (!params.containsKey("r")) {
error("Repository not specified!");
redirectToInterceptPage(new RepositoriesPage());
}
- repositoryName = params.getString("r", "");
- objectId = params.getString("h", "HEAD");
+ repositoryName = WicketUtils.getRepositoryName(params);
+ objectId = WicketUtils.getObject(params);
Repository r = getRepository();
@@ -51,7 +62,7 @@
HttpServletRequest req = servletWebRequest.getHttpServletRequest();
req.getServerName();
- Repository r = GitBlitWebApp.get().getRepository(req, repositoryName);
+ Repository r = GitBlit.self().getRepository(req, repositoryName);
if (r == null) {
error("Can not load repository " + repositoryName);
redirectToInterceptPage(new RepositoriesPage());
@@ -64,24 +75,28 @@
}
protected void addRefs(Repository r, RevCommit c) {
- add(new RefsPanel("refsPanel", r, c));
+ add(new RefsPanel("refsPanel", repositoryName, c, JGitUtils.getAllRefs(r)));
}
protected void addFullText(String wicketId, String text, boolean substituteRegex) {
- String html = WicketUtils.breakLines(text);
+ String html = StringUtils.breakLinesForHtml(text);
if (substituteRegex) {
Map<String, String> map = new HashMap<String, String>();
// global regex keys
- for (String key : StoredSettings.getAllKeys("regex.global")) {
- String subKey = key.substring(key.lastIndexOf('.') + 1);
- map.put(subKey, StoredSettings.getString(key, ""));
+ if (GitBlit.self().settings().getBoolean(Keys.regex.global, false)) {
+ for (String key : GitBlit.self().settings().getAllKeys(Keys.regex.global)) {
+ if (!key.equals(Keys.regex.global)) {
+ String subKey = key.substring(key.lastIndexOf('.') + 1);
+ map.put(subKey, GitBlit.self().settings().getString(key, ""));
+ }
+ }
}
// repository-specific regex keys
- List<String> keys = StoredSettings.getAllKeys("regex." + repositoryName.toLowerCase());
+ List<String> keys = GitBlit.self().settings().getAllKeys(Keys.regex._ROOT + "." + repositoryName.toLowerCase());
for (String key : keys) {
String subKey = key.substring(key.lastIndexOf('.') + 1);
- map.put(subKey, StoredSettings.getString(key, ""));
+ map.put(subKey, GitBlit.self().settings().getString(key, ""));
}
for (String key : map.keySet()) {
@@ -99,6 +114,38 @@
protected abstract String getPageName();
+
+ protected Component createPersonPanel(String wicketId, PersonIdent identity, SearchType searchType) {
+ if (StringUtils.isEmpty(identity.getName()) || StringUtils.isEmpty(identity.getEmailAddress())) {
+ String value = identity.getName();
+ if (StringUtils.isEmpty(value)) {
+ value = identity.getEmailAddress();
+ }
+ Fragment partial = new Fragment(wicketId, "partialPersonIdent", this);
+ LinkPanel link = new LinkPanel("personName", "list", value, SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType));
+ setPersonSearchTooltip(link, value, searchType);
+ partial.add(link);
+ return partial;
+ } else {
+ Fragment fullPerson = new Fragment(wicketId, "fullPersonIdent", this);
+ LinkPanel nameLink = new LinkPanel("personName", "list", identity.getName(), SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, identity.getName(), searchType));
+ setPersonSearchTooltip(nameLink, identity.getName(), searchType);
+ fullPerson.add(nameLink);
+
+ LinkPanel addressLink = new LinkPanel("personAddress", "list", "<" + identity.getEmailAddress() + ">", SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, identity.getEmailAddress(), searchType));
+ setPersonSearchTooltip(addressLink, identity.getEmailAddress(), searchType);
+ fullPerson.add(addressLink);
+ return fullPerson;
+ }
+ }
+
+ protected void setPersonSearchTooltip(Component component, String value, SearchType searchType) {
+ if (searchType.equals(SearchType.AUTHOR)) {
+ WicketUtils.setHtmlTitle(component, getString("gb.searchForAuthor") + " " + value);
+ } else if (searchType.equals(SearchType.COMMITTER)) {
+ WicketUtils.setHtmlTitle(component, getString("gb.searchForCommitter") + " " + value);
+ }
+ }
@Override
protected void onBeforeRender() {
// dispose of repository object
--
Gitblit v1.9.1