From 3c7e07406c0054d97fa6e037894eeac491f74d1d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:11:20 -0400
Subject: [PATCH] Show email addresses on users panel

---
 src/com/gitblit/wicket/panels/UsersPanel.html |  2 ++
 src/com/gitblit/wicket/panels/UsersPanel.java | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/com/gitblit/wicket/panels/UsersPanel.html b/src/com/gitblit/wicket/panels/UsersPanel.html
index aaa7870a..8e0ed1f1 100644
--- a/src/com/gitblit/wicket/panels/UsersPanel.html
+++ b/src/com/gitblit/wicket/panels/UsersPanel.html
@@ -16,6 +16,7 @@
 				<wicket:message key="gb.users">[users]</wicket:message>
 			</th>
 			<th class="hidden-phone hidden-tablet left"><wicket:message key="gb.displayName">[display name]</wicket:message></th>
+			<th class="hidden-phone hidden-tablet left"><wicket:message key="gb.emailAddress">[email address]</wicket:message></th>
 			<th class="hidden-phone" style="width:120px;"><wicket:message key="gb.accessLevel">[access level]</wicket:message></th>
 			<th class="hidden-phone" style="width:140px;"><wicket:message key="gb.teamMemberships">[team memberships]</wicket:message></th>
 			<th class="hidden-phone" style="width:100px;"><wicket:message key="gb.repositories">[repositories]</wicket:message></th>
@@ -25,6 +26,7 @@
        		<tr wicket:id="userRow">
        			<td class="left" ><span class="list" wicket:id="username">[username]</span></td>
        			<td class="hidden-phone hidden-tablet left" ><span class="list" wicket:id="displayName">[display name]</span></td>
+       			<td class="hidden-phone hidden-tablet left" ><span class="list" wicket:id="emailAddress">[email address]</span></td>
        			<td class="hidden-phone left" ><span class="list" wicket:id="accesslevel">[access level]</span></td>
        			<td class="hidden-phone left" ><span class="list" wicket:id="teams">[team memberships]</span></td>
        			<td class="hidden-phone left" ><span class="list" wicket:id="repositories">[repositories]</span></td>
diff --git a/src/com/gitblit/wicket/panels/UsersPanel.java b/src/com/gitblit/wicket/panels/UsersPanel.java
index 39a5963a..6672c407 100644
--- a/src/com/gitblit/wicket/panels/UsersPanel.java
+++ b/src/com/gitblit/wicket/panels/UsersPanel.java
@@ -71,7 +71,16 @@ public class UsersPanel extends BasePanel {
 					WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.getDisplayName());
 					item.add(editLink);
 				}
-				
+
+				if (StringUtils.isEmpty(entry.emailAddress)) {
+					item.add(new Label("emailAddress").setVisible(false));
+				} else {
+					editLink = new LinkPanel("emailAddress", "list", entry.emailAddress,
+						EditUserPage.class, WicketUtils.newUsernameParameter(entry.username));
+					WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.getDisplayName());
+					item.add(editLink);
+				}
+
 				item.add(new Label("accesslevel", entry.canAdmin ? "administrator" : ""));
 				item.add(new Label("teams", entry.teams.size() > 0 ? ("" + entry.teams.size()) : ""));
 				item.add(new Label("repositories",
-- 
2.39.5