TRKJ/gitea
2
0
Fork 0
mirror of https://gitee.com/gitea/gitea synced 2025-11-04 16:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show the username as a fallback on feeds if full name is blank (#10461)

Browse Source 
Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
James Lakin
2020-02-27 01:59:07 +00:00
committed by GitHub
parent 1fbdd9335f
commit 7bf5834f2c
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
models/action.go
View File

@@ -122,10 +122,13 @@ func (a *Action) ShortActUserName() string {
return base.EllipsisString(a.GetActUserName(), 20) return base.EllipsisString(a.GetActUserName(), 20)
} }
// GetDisplayName gets the action's display name based on DEFAULT_SHOW_FULL_NAME // GetDisplayName gets the action's display name based on DEFAULT_SHOW_FULL_NAME, or falls back to the username if it is blank.
func (a *Action) GetDisplayName() string { func (a *Action) GetDisplayName() string {
if setting.UI.DefaultShowFullName { if setting.UI.DefaultShowFullName {
return a.GetActFullName() trimmedFullName := strings.TrimSpace(a.GetActFullName())
if len(trimmedFullName) > 0 {
return trimmedFullName
}
} }
return a.ShortActUserName() return a.ShortActUserName()
} }

8
models/user.go
View File

@@ -712,9 +712,11 @@ func (u *User) DisplayName() string {
// GetDisplayName returns full name if it's not empty and DEFAULT_SHOW_FULL_NAME is set, // GetDisplayName returns full name if it's not empty and DEFAULT_SHOW_FULL_NAME is set,
// returns username otherwise. // returns username otherwise.
func (u *User) GetDisplayName() string { func (u *User) GetDisplayName() string {
trimmed := strings.TrimSpace(u.FullName) if setting.UI.DefaultShowFullName {
if len(trimmed) > 0 && setting.UI.DefaultShowFullName { trimmed := strings.TrimSpace(u.FullName)
return trimmed if len(trimmed) > 0 {
return trimmed
}
} }
return u.Name return u.Name
} }