[openmeetings] branch master updated: [OPENMEETINGS-2102] display name is re-generated if wasn't entered by the user

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 7ae26f7  [OPENMEETINGS-2102] display name is re-generated if wasn't entered by the user
7ae26f7 is described below

commit 7ae26f773f3d6e1421e48b5bf72e33b9899f7687
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Aug 21 12:02:34 2019 +0700

    [OPENMEETINGS-2102] display name is re-generated if wasn't entered by the user
---
 .../src/main/java/org/apache/openmeetings/db/entity/user/User.java | 7 ++++++-
 .../java/org/apache/openmeetings/web/admin/users/UserForm.java     | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index f3619bf..f293280 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -113,6 +113,7 @@ import org.simpleframework.xml.Root;
 @Root(name = "user")
 public class User extends HistoricalEntity {
 	private static final long serialVersionUID = 1L;
+	public static final String DISPLAY_NAME_NA = "N/A";
 	public static final int SALUTATION_MR_ID = 1;
 	public static final int SALUTATION_MS_ID = 2;
 	public static final int SALUTATION_MRS_ID = 3;
@@ -391,6 +392,10 @@ public class User extends HistoricalEntity {
 		return this;
 	}
 
+	public void resetDisplayName() {
+		displayName = generateDisplayName();
+	}
+
 	public String getLogin() {
 		return login;
 	}
@@ -657,7 +662,7 @@ public class User extends HistoricalEntity {
 			sb.append(delim).append(address.getEmail());
 		}
 		if (Strings.isEmpty(sb)) {
-			sb.append("N/A");
+			sb.append(DISPLAY_NAME_NA);
 		}
 		return escapeMarkup(sb).toString();
 	}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 7daf391..97f3ce2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.admin.users;
 
 import static java.util.UUID.randomUUID;
 import static org.apache.openmeetings.db.dao.user.UserDao.getNewUserInstance;
+import static org.apache.openmeetings.db.entity.user.User.DISPLAY_NAME_NA;
 import static org.apache.openmeetings.db.util.AuthLevelUtil.hasAdminLevel;
 import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.getMinLoginLength;
@@ -245,6 +246,9 @@ public class UserForm extends AdminBaseForm<User> {
 		if (isNew && sendEmailAtRegister) {
 			u.setActivatehash(randomUUID().toString());
 		}
+		if (isNew && DISPLAY_NAME_NA.equals(u.getDisplayName())) {
+			u.resetDisplayName();
+		}
 		try {
 			u = userDao.update(u, pass, getUserId());
 		} catch (Exception e) {