From 9051a616c1ba9a64092b91b31f9052b4b051af38 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 22 Jul 2013 08:25:46 -0400
Subject: [PATCH] Fixed incorrecter tagger in dashboard pages (issue-276)

---
 releases.moxie                                |  2 ++
 .../gitblit/wicket/panels/DigestsPanel.java   | 19 +++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 0bf15781..de26245d 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -18,6 +18,7 @@ r18: {
 	- Reset dashboard and activity commit cache on branch REWIND or DELETE
 	- Fixed bug with adding new local users with external authentication
 	- Fixed missing clone url on the empty repository page
+	- Fixed incorrect tagger in the dashboard pages (issue-276)
     changes:
 	- updated Chinese translation
 	- updated Dutch translation
@@ -37,6 +38,7 @@ r18: {
 	- Chad Horohoe
 	- Eduardo Guervós Narvaez
 	- Dongsu, KIM
+	- Gareth Collins
 }
 
 #
diff --git a/src/main/java/com/gitblit/wicket/panels/DigestsPanel.java b/src/main/java/com/gitblit/wicket/panels/DigestsPanel.java
index 0f380a49..3590dfee 100644
--- a/src/main/java/com/gitblit/wicket/panels/DigestsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/DigestsPanel.java
@@ -28,6 +28,7 @@ import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.eclipse.jgit.lib.PersonIdent;
 
 import com.gitblit.Constants;
 import com.gitblit.GitBlit;
@@ -42,7 +43,6 @@ import com.gitblit.wicket.pages.ComparePage;
 import com.gitblit.wicket.pages.SummaryPage;
 import com.gitblit.wicket.pages.TagPage;
 import com.gitblit.wicket.pages.TreePage;
-import com.gitblit.wicket.pages.UserPage;
 
 public class DigestsPanel extends BasePanel {
 
@@ -111,17 +111,16 @@ public class DigestsPanel extends BasePanel {
 				}
 				logItem.add(changeIcon);
 
-                if (!isTag) {
-                	logItem.add(new Label("whoChanged").setVisible(false));
-                } else {
-                	if (change.user.username.equals(change.user.emailAddress) && change.user.emailAddress.indexOf('@') > -1) {
-                		// username is an email address can not link - 1.2.1 push log bug
-                		logItem.add(new Label("whoChanged", change.user.getDisplayName()));
+                if (isTag) {
+                	// tags are special
+                	PersonIdent ident = change.getCommits().get(0).getAuthorIdent();
+                	if (!StringUtils.isEmpty(ident.getName())) {
+                		logItem.add(new Label("whoChanged", ident.getName()));
                 	} else {
-                		// link to user account page
-                		logItem.add(new LinkPanel("whoChanged", null, change.user.getDisplayName(),
-                				UserPage.class, WicketUtils.newUsernameParameter(change.user.username)));
+                		logItem.add(new Label("whoChanged", ident.getEmailAddress()));
                 	}
+                } else {
+                	logItem.add(new Label("whoChanged").setVisible(false));
                 }
 				
 				String preposition = "gb.of";
-- 
2.39.5