From 022931842214f04f9f4bdb1ba94f2d5feaae44e2 Mon Sep 17 00:00:00 2001
From: Konstantinos Kostarellis <kosta.grails@gmail.com>
Date: Wed, 18 Jul 2012 02:52:30 -0400
Subject: [PATCH] Added shell script equivalents to the cmd versions to generate the keystore
---
src/com/gitblit/models/UserModel.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index 925edf9..6632c61 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -37,6 +37,7 @@
// field names are reflectively mapped in EditUser page
public String username;
public String password;
+ public String cookie;
public String displayName;
public String emailAddress;
public boolean canAdmin;
@@ -114,6 +115,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