From 6fdbc6b5bdb805d1faefe3f26105d5adfa37d5a1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 28 Mar 2012 12:03:19 -0400
Subject: [PATCH] Merge pull request #9 from mohamedmansour/master
---
src/com/gitblit/wicket/panels/ActivityPanel.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java
index dc94f3c..250b58d 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.java
@@ -32,7 +32,7 @@
import com.gitblit.wicket.pages.CommitDiffPage;
import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.LogPage;
-import com.gitblit.wicket.pages.SearchPage;
+import com.gitblit.wicket.pages.GitSearchPage;
import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TreePage;
@@ -50,7 +50,7 @@
super(wicketId);
Collections.sort(recentActivity);
-
+
DataView<Activity> activityView = new DataView<Activity>("activity",
new ListDataProvider<Activity>(recentActivity)) {
private static final long serialVersionUID = 1L;
@@ -68,8 +68,8 @@
final RepositoryCommit commit = item.getModelObject();
Fragment fragment = new Fragment("commit", "commitFragment", this);
- // time of day
- fragment.add(WicketUtils.createTimeLabel("time", commit.getAuthorIdent()
+ // commit time of day
+ fragment.add(WicketUtils.createTimeLabel("time", commit.getCommitterIdent()
.getWhen(), getTimeZone()));
// avatar
@@ -86,7 +86,7 @@
// author search link
String author = commit.getAuthorIdent().getName();
LinkPanel authorLink = new LinkPanel("author", "list", author,
- SearchPage.class, WicketUtils.newSearchParameter(commit.repository,
+ GitSearchPage.class, WicketUtils.newSearchParameter(commit.repository,
commit.getName(), author, Constants.SearchType.AUTHOR), true);
setPersonSearchTooltip(authorLink, author, Constants.SearchType.AUTHOR);
fragment.add(authorLink);
--
Gitblit v1.9.1