lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #156 from bsinno/Bug/Show_User_Information

Browse Source 
Fix: Return trimmed username
This commit is contained in:
Michael Hirsch
2016-04-28 16:47:17 +02:00
parent 97eb406fa6 345e9a7cf3
commit e899a3553f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java
View File

@@ -88,12 +88,10 @@ public final class UserDetailsFormatter {
* name to max 12 characters. @see * name to max 12 characters. @see
* {@link UserDetailsFormatter#loadAndFormatUsername(String, int)} * {@link UserDetailsFormatter#loadAndFormatUsername(String, int)}
* *
* @param baseEntity
* the entity
* @return the formatted user name (max 12 characters) cannot be <null> * @return the formatted user name (max 12 characters) cannot be <null>
*/ */
public static String loadAndFormatCurrentUsername() { public static String formatCurrentUsername() {
return loadAndFormatUsername(getCurrentUser().getUsername(), 12); return loadAndFormatUsername(getCurrentUser().getUsername(), 5);
} }
/** /**
@@ -114,6 +112,10 @@ public final class UserDetailsFormatter {
*/ */
public static String loadAndFormatUsername(final String username, final int expectedNameLength) { public static String loadAndFormatUsername(final String username, final int expectedNameLength) {
final UserDetails userDetails = loadUserByUsername(username); final UserDetails userDetails = loadUserByUsername(username);
return formatUserName(expectedNameLength, userDetails);
}
private static String formatUserName(final int expectedNameLength, final UserDetails userDetails) {
if (!(userDetails instanceof UserPrincipal)) { if (!(userDetails instanceof UserPrincipal)) {
return userDetails.getUsername(); return userDetails.getUsername();
} }
@@ -134,7 +136,7 @@ public final class UserDetailsFormatter {
if (StringUtils.isEmpty(trimmedUsername)) { if (StringUtils.isEmpty(trimmedUsername)) {
return trimAndFormatDetail(userPrincipal.getLoginname(), expectedNameLength); return trimAndFormatDetail(userPrincipal.getLoginname(), expectedNameLength);
} }
return firstAndLastname; return trimmedUsername;
} }
/** /**

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
View File

@@ -193,7 +193,7 @@ public final class DashboardMenu extends CustomComponent {
final MenuItem settingsItem = settings.addItem("", new ThemeResource("images/profile-pic-57px.jpg"), null); final MenuItem settingsItem = settings.addItem("", new ThemeResource("images/profile-pic-57px.jpg"), null);
final String formattedTenant = UserDetailsFormatter.formatCurrentTenant(); final String formattedTenant = UserDetailsFormatter.formatCurrentTenant();
final String formattedUsername = UserDetailsFormatter.loadAndFormatCurrentUsername(); final String formattedUsername = UserDetailsFormatter.formatCurrentUsername();
String tenantAndUsernameHtml = ""; String tenantAndUsernameHtml = "";
if (!StringUtils.isEmpty(formattedTenant)) { if (!StringUtils.isEmpty(formattedTenant)) {
tenantAndUsernameHtml += formattedTenant + "<br>"; tenantAndUsernameHtml += formattedTenant + "<br>";