diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-03-02 23:30:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 15:30:18 +0000 |
| commit | 3f081d4b54261c1b4ee4f1df40c610fdd9581ef2 (patch) | |
| tree | b037746b75987430eafccf8a7b84147be1840ba3 | |
| parent | 27deea7330f83ddb37c918afbb4159053d8847cb (diff) | |
| download | gitea-3f081d4b54261c1b4ee4f1df40c610fdd9581ef2.tar.gz gitea-3f081d4b54261c1b4ee4f1df40c610fdd9581ef2.zip | |
Rename Action.GetDisplayName to GetActDisplayName (#29540)
To avoid conflicting with User.GetDisplayName, because there is no data
type in template.
And it matches other methods like GetActFullName / GetActUserName
| -rw-r--r-- | models/activities/action.go | 8 | ||||
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/models/activities/action.go b/models/activities/action.go index 15bd9a52ac..fcc97e3872 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -225,8 +225,8 @@ func (a *Action) ShortActUserName(ctx context.Context) string { return base.EllipsisString(a.GetActUserName(ctx), 20) } -// 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(ctx context.Context) string { +// GetActDisplayName 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) GetActDisplayName(ctx context.Context) string { if setting.UI.DefaultShowFullName { trimmedFullName := strings.TrimSpace(a.GetActFullName(ctx)) if len(trimmedFullName) > 0 { @@ -236,8 +236,8 @@ func (a *Action) GetDisplayName(ctx context.Context) string { return a.ShortActUserName(ctx) } -// GetDisplayNameTitle gets the action's display name used for the title (tooltip) based on DEFAULT_SHOW_FULL_NAME -func (a *Action) GetDisplayNameTitle(ctx context.Context) string { +// GetActDisplayNameTitle gets the action's display name used for the title (tooltip) based on DEFAULT_SHOW_FULL_NAME +func (a *Action) GetActDisplayNameTitle(ctx context.Context) string { if setting.UI.DefaultShowFullName { return a.ShortActUserName(ctx) } diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 6dec610e93..0e7371ad83 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -7,7 +7,7 @@ <div class="flex-item-main gt-gap-3"> <div> {{if gt .ActUser.ID 0}} - <a href="{{AppSubUrl}}/{{(.GetActUserName ctx) | PathEscape}}" title="{{.GetDisplayNameTitle ctx}}">{{.GetDisplayName ctx}}</a> + <a href="{{AppSubUrl}}/{{(.GetActUserName ctx) | PathEscape}}" title="{{.GetActDisplayNameTitle ctx}}">{{.GetActDisplayName ctx}}</a> {{else}} {{.ShortActUserName ctx}} {{end}} |