From 36148ed0838e205d08fd8b8362f2062f7925cfd5 Mon Sep 17 00:00:00 2001 From: Wim Date: Sun, 20 Feb 2022 22:47:17 +0100 Subject: [PATCH] Show fullname on issue edits and gpg/ssh signing info (#18828) Co-authored-by: zeripath --- models/issues/content_history.go | 3 ++- models/issues/content_history_test.go | 5 +++-- routers/web/repo/issue_content_history.go | 10 +++++++++- templates/repo/commit_page.tmpl | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/models/issues/content_history.go b/models/issues/content_history.go index 721ce11f85..57a6ea728f 100644 --- a/models/issues/content_history.go +++ b/models/issues/content_history.go @@ -137,6 +137,7 @@ func QueryIssueContentHistoryEditedCountMap(dbCtx context.Context, issueID int64 type IssueContentListItem struct { UserID int64 UserName string + UserFullName string UserAvatarLink string HistoryID int64 @@ -148,7 +149,7 @@ type IssueContentListItem struct { // FetchIssueContentHistoryList fetch list func FetchIssueContentHistoryList(dbCtx context.Context, issueID, commentID int64) ([]*IssueContentListItem, error) { res := make([]*IssueContentListItem, 0) - err := db.GetEngine(dbCtx).Select("u.id as user_id, u.name as user_name,"+ + err := db.GetEngine(dbCtx).Select("u.id as user_id, u.name as user_name, u.full_name as user_full_name,"+ "h.id as history_id, h.edited_unix, h.is_first_created, h.is_deleted"). Table([]string{"issue_content_history", "h"}). Join("LEFT", []string{"user", "u"}, "h.poster_id = u.id"). diff --git a/models/issues/content_history_test.go b/models/issues/content_history_test.go index cc9a7c5107..71ccc6e6a7 100644 --- a/models/issues/content_history_test.go +++ b/models/issues/content_history_test.go @@ -43,8 +43,9 @@ func TestContentHistory(t *testing.T) { when the refactor of models are done, this test will be possible to be run then with a real `User` model. */ type User struct { - ID int64 - Name string + ID int64 + Name string + FullName string } _ = dbEngine.Sync2(&User{}) diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index 08eb98acb8..90217a0346 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -9,6 +9,7 @@ import ( "fmt" "html" "net/http" + "strings" "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/db" @@ -16,6 +17,7 @@ import ( "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" "github.com/sergi/go-diff/diffmatchpatch" @@ -68,9 +70,15 @@ func GetContentHistoryList(ctx *context.Context) { actionText = i18n.Tr(lang, "repo.issues.content_history.edited") } timeSinceText := timeutil.TimeSinceUnix(item.EditedUnix, lang) + + username := item.UserName + if setting.UI.DefaultShowFullName && strings.TrimSpace(item.UserFullName) != "" { + username = strings.TrimSpace(item.UserFullName) + } + results = append(results, map[string]interface{}{ "name": fmt.Sprintf("%s %s %s", - html.EscapeString(item.UserAvatarLink), html.EscapeString(item.UserName), actionText, timeSinceText), + html.EscapeString(item.UserAvatarLink), html.EscapeString(username), actionText, timeSinceText), "value": item.HistoryID, }) } diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index c995273643..0248a0deda 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -93,12 +93,12 @@ {{.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}} {{avatar .Verification.SigningUser 28}} - {{.Verification.SigningUser.Name}} + {{.Verification.SigningUser.GetDisplayName}} {{else}} {{svg "gitea-lock-cog"}} {{.i18n.Tr "repo.commits.signed_by"}}: {{avatarByEmail .Verification.SigningEmail "" 28}} - {{.Verification.SigningUser.Name}} + {{.Verification.SigningUser.GetDisplayName}} {{end}} {{else}} {{svg "gitea-unlock" 16 "mr-3"}}