From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java b/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
index 689ee57..4156cd1 100644
--- a/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
+++ b/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
@@ -138,10 +138,10 @@
}
} else if (RegistrantType.USER.equals(entry.registrantType)) {
// user
- PersonIdent ident = new PersonIdent(entry.registrant, null);
+ PersonIdent ident = new PersonIdent(entry.registrant, "");
UserModel user = GitBlit.self().getUserModel(entry.registrant);
if (user != null) {
- ident = new PersonIdent(user.getDisplayName(), user.emailAddress);
+ ident = new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.getDisplayName() : user.emailAddress);
}
Fragment userFragment = new Fragment("registrant", "userRegistrant", RegistrantPermissionsPanel.this);
--
Gitblit v1.9.1