From 470a156243c9b558bc61085b5196994cf71a5090 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 27 Apr 2012 17:30:05 -0400
Subject: [PATCH] Added Ivy 2.2.0 dependency (issue 91)
---
src/com/gitblit/models/UserModel.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index ecb97cf..b0e57fd 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -37,6 +37,8 @@
// field names are reflectively mapped in EditUser page
public String username;
public String password;
+ public String displayName;
+ public String emailAddress;
public boolean canAdmin;
public boolean excludeFromFederation;
public final Set<String> repositories = new HashSet<String>();
@@ -112,6 +114,13 @@
public String getName() {
return username;
}
+
+ public String getDisplayName() {
+ if (StringUtils.isEmpty(displayName)) {
+ return username;
+ }
+ return displayName;
+ }
@Override
public String toString() {
--
Gitblit v1.9.1