From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 25 Feb 2013 08:40:30 -0500 Subject: [PATCH] Merge pull request #75 from thefake/master --- src/com/gitblit/wicket/panels/SearchPanel.java | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/com/gitblit/wicket/panels/SearchPanel.java b/src/com/gitblit/wicket/panels/SearchPanel.java index 759040e..9d38ab0 100644 --- a/src/com/gitblit/wicket/panels/SearchPanel.java +++ b/src/com/gitblit/wicket/panels/SearchPanel.java @@ -28,16 +28,16 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import com.gitblit.Constants; import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.RefModel; import com.gitblit.utils.JGitUtils; -import com.gitblit.utils.JGitUtils.SearchType; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.pages.CommitDiffPage; import com.gitblit.wicket.pages.CommitPage; -import com.gitblit.wicket.pages.SearchPage; +import com.gitblit.wicket.pages.GitSearchPage; import com.gitblit.wicket.pages.TreePage; public class SearchPanel extends BasePanel { @@ -47,7 +47,8 @@ private boolean hasMore; public SearchPanel(String wicketId, final String repositoryName, final String objectId, - final String value, SearchType searchType, Repository r, int limit, int pageOffset) { + final String value, Constants.SearchType searchType, Repository r, int limit, int pageOffset, + boolean showRemoteRefs) { super(wicketId); boolean pageResults = limit <= 0; int itemsPerPage = GitBlit.getInteger(Keys.web.itemsPerPage, 50); @@ -57,7 +58,7 @@ RevCommit commit = JGitUtils.getCommit(r, objectId); - final Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(r); + final Map<ObjectId, List<RefModel>> allRefs = JGitUtils.getAllRefs(r, showRemoteRefs); List<RevCommit> commits; if (pageResults) { // Paging result set @@ -74,7 +75,7 @@ // header add(new CommitHeaderPanel("commitHeader", repositoryName, commit)); - + add(new Label("searchString", value)); add(new Label("searchType", searchType.toString())); @@ -87,14 +88,14 @@ final RevCommit entry = item.getModelObject(); final Date date = JGitUtils.getCommitDate(entry); - item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone())); + item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils())); // author search link String author = entry.getAuthorIdent().getName(); LinkPanel authorLink = new LinkPanel("commitAuthor", "list", author, - SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, - author, SearchType.AUTHOR)); - setPersonSearchTooltip(authorLink, author, SearchType.AUTHOR); + GitSearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId, + author, Constants.SearchType.AUTHOR)); + setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR); item.add(authorLink); // merge icon @@ -105,7 +106,12 @@ } String shortMessage = entry.getShortMessage(); - String trimmedMessage = StringUtils.trimShortLog(shortMessage); + String trimmedMessage = shortMessage; + if (allRefs.containsKey(entry.getId())) { + trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG_REFS); + } else { + trimmedMessage = StringUtils.trimString(shortMessage, Constants.LEN_SHORTLOG); + } LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter( repositoryName, entry.getName())); -- Gitblit v1.9.1