Fixed incorrecter tagger in dashboard pages (issue-276)

diff --git a/releases.moxie b/releases.moxie
index 0bf15781c673360d4df510022db64968554dc7af..de26245d1a51613e5c3988b3221ebb7dddef58ef 100644 (file)
--- 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 0f380a49703bc3389863550aa1cb50fe0e35b771..3590dfee857ddd3728278d9d6d27f4fe5ef4867c 100644 (file)
--- 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;\r
 import org.apache.wicket.markup.repeater.data.DataView;\r
 import org.apache.wicket.markup.repeater.data.ListDataProvider;\r
+import org.eclipse.jgit.lib.PersonIdent;\r
 \r
 import com.gitblit.Constants;\r
 import com.gitblit.GitBlit;\r
@@ -42,7 +43,6 @@ import com.gitblit.wicket.pages.ComparePage;
 import com.gitblit.wicket.pages.SummaryPage;\r
 import com.gitblit.wicket.pages.TagPage;\r
 import com.gitblit.wicket.pages.TreePage;\r
-import com.gitblit.wicket.pages.UserPage;\r
 \r
 public class DigestsPanel extends BasePanel {\r
 \r
@@ -111,17 +111,16 @@ public class DigestsPanel extends BasePanel {
                                }\r
                                logItem.add(changeIcon);\r
 \r
-                if (!isTag) {\r
-                       logItem.add(new Label("whoChanged").setVisible(false));\r
-                } else {\r
-                       if (change.user.username.equals(change.user.emailAddress) && change.user.emailAddress.indexOf('@') > -1) {\r
-                               // username is an email address can not link - 1.2.1 push log bug\r
-                               logItem.add(new Label("whoChanged", change.user.getDisplayName()));\r
+                if (isTag) {\r
+                       // tags are special\r
+                       PersonIdent ident = change.getCommits().get(0).getAuthorIdent();\r
+                       if (!StringUtils.isEmpty(ident.getName())) {\r
+                               logItem.add(new Label("whoChanged", ident.getName()));\r
                        } else {\r
-                               // link to user account page\r
-                               logItem.add(new LinkPanel("whoChanged", null, change.user.getDisplayName(),\r
-                                               UserPage.class, WicketUtils.newUsernameParameter(change.user.username)));\r
+                               logItem.add(new Label("whoChanged", ident.getEmailAddress()));\r
                        }\r
+                } else {\r
+                       logItem.add(new Label("whoChanged").setVisible(false));\r
                 }\r
                                \r
                                String preposition = "gb.of";\r