diff options
Diffstat (limited to 'models/action.go')
| -rw-r--r-- | models/action.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/models/action.go b/models/action.go index b8694aad73..267a19bc62 100644 --- a/models/action.go +++ b/models/action.go @@ -120,10 +120,13 @@ func (a *Action) ShortActUserName() string { 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 { if setting.UI.DefaultShowFullName { - return a.GetActFullName() + trimmedFullName := strings.TrimSpace(a.GetActFullName()) + if len(trimmedFullName) > 0 { + return trimmedFullName + } } return a.ShortActUserName() } |