From 22a9488e3ce4d9b5df4fab513d633e701a91de5a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 13 Aug 2012 16:29:02 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit
---
src/com/gitblit/wicket/panels/BranchesPanel.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.java b/src/com/gitblit/wicket/panels/BranchesPanel.java
index 0d2fe4a..8bbab9a 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.java
@@ -40,7 +40,7 @@
import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.MetricsPage;
-import com.gitblit.wicket.pages.SearchPage;
+import com.gitblit.wicket.pages.GitSearchPage;
import com.gitblit.wicket.pages.TreePage;
public class BranchesPanel extends BasePanel {
@@ -83,7 +83,7 @@
public void populateItem(final Item<RefModel> item) {
final RefModel entry = item.getModelObject();
- item.add(WicketUtils.createDateLabel("branchDate", entry.getDate(), getTimeZone()));
+ item.add(WicketUtils.createDateLabel("branchDate", entry.getDate(), getTimeZone(), getTimeUtils()));
item.add(new LinkPanel("branchName", "list name", StringUtils.trimString(
entry.displayName, 28), LogPage.class, WicketUtils.newObjectParameter(
@@ -91,7 +91,7 @@
String author = entry.getAuthorIdent().getName();
LinkPanel authorLink = new LinkPanel("branchAuthor", "list", author,
- SearchPage.class, WicketUtils.newSearchParameter(model.name,
+ GitSearchPage.class, WicketUtils.newSearchParameter(model.name,
entry.getName(), author, Constants.SearchType.AUTHOR));
setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
item.add(authorLink);
--
Gitblit v1.9.1