From dfc4ece4083bbbb98f55291d05e7d2b1513464b7 Mon Sep 17 00:00:00 2001 From: Thomas Pummer <dev@nullpointer.at> Date: Fri, 22 Feb 2013 11:10:11 -0500 Subject: [PATCH] the display-name in web.xml now shows the actual version of Gitblit --- src/com/gitblit/wicket/panels/SearchPanel.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/panels/SearchPanel.java b/src/com/gitblit/wicket/panels/SearchPanel.java index 4d195c5..9d38ab0 100644 --- a/src/com/gitblit/wicket/panels/SearchPanel.java +++ b/src/com/gitblit/wicket/panels/SearchPanel.java @@ -47,7 +47,8 @@ private boolean hasMore; public SearchPanel(String wicketId, final String repositoryName, final String objectId, - final String value, Constants.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 @@ -87,7 +88,7 @@ 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(); -- Gitblit v1.9.1