From: James Moger Date: Sun, 25 Mar 2012 22:10:33 +0000 (-0400) Subject: Corrected timestamp on activity panel from author time to committer time X-Git-Tag: v0.9.0~12 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=74e73c7f2cd1f0ecc4e65d009e0d8ce2d9160e97;p=gitblit.git Corrected timestamp on activity panel from author time to committer time --- diff --git a/src/com/gitblit/models/Activity.java b/src/com/gitblit/models/Activity.java index 9d58ef07..771c8a1a 100644 --- a/src/com/gitblit/models/Activity.java +++ b/src/com/gitblit/models/Activity.java @@ -179,7 +179,11 @@ public class Activity implements Serializable, Comparable { public PersonIdent getAuthorIdent() { return commit.getAuthorIdent(); } - + + public PersonIdent getCommitterIdent() { + return commit.getCommitterIdent(); + } + @Override public boolean equals(Object o) { if (o instanceof RepositoryCommit) { diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java index a7e68d86..250b58df 100644 --- a/src/com/gitblit/wicket/panels/ActivityPanel.java +++ b/src/com/gitblit/wicket/panels/ActivityPanel.java @@ -68,8 +68,8 @@ public class ActivityPanel extends BasePanel { 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