diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index eff80eb618..1dcddb598a 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -82,7 +82,7 @@ func Branches(ctx *context.Context) { ctx.Data["Keyword"] = kw ctx.Data["Branches"] = branches - ctx.Data["CommitStatus"] = combinedStatuses + ctx.Data["CombinedStatuses"] = combinedStatuses ctx.Data["CommitStatuses"] = commitStatuses ctx.Data["DefaultBranchBranch"] = defaultBranch pager := context.NewPagination(int(branchesCount), pageSize, page, 5) diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index d15e5b91c8..70d919c2ab 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -385,7 +385,7 @@ func Diff(ctx *context.Context) { git_model.CommitStatusesHideActionsURL(ctx, statuses) } - ctx.Data["CommitStatus"] = git_model.CalcCombinedStatus(statuses) + ctx.Data["CombinedStatus"] = git_model.CalcCombinedStatus(statuses) ctx.Data["CommitStatuses"] = statuses verification := asymkey_service.ParseCommitWithSignature(ctx, commit) diff --git a/routers/web/repo/issue_list.go b/routers/web/repo/issue_list.go index 35107bc585..0027a95bc9 100644 --- a/routers/web/repo/issue_list.go +++ b/routers/web/repo/issue_list.go @@ -665,7 +665,7 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID, projectID int6 } } - commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, issues) + commitStatuses, combinedStatuses, err := pull_service.GetIssuesAllCommitStatus(ctx, issues) if err != nil { ctx.ServerError("GetIssuesAllCommitStatus", err) return @@ -682,7 +682,7 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID, projectID int6 } ctx.Data["Issues"] = issues - ctx.Data["CommitLastStatus"] = lastStatus + ctx.Data["CombinedStatuses"] = combinedStatuses ctx.Data["CommitStatuses"] = commitStatuses // Get assignees. diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index 223b399b3a..f5ab026d68 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -16,7 +16,6 @@ import ( repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/commitstatus" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" "code.gitea.io/gitea/modules/markup/markdown" @@ -72,7 +71,7 @@ func calReleaseNumCommitsBehind(repoCtx *context.Repository, release *repo_model type ReleaseInfo struct { Release *repo_model.Release - CommitStatus commitstatus.CombinedStatusState + CombinedStatus *git_model.CombinedStatus CommitStatuses []*git_model.CommitStatus } @@ -136,7 +135,7 @@ func getReleaseInfos(ctx *context.Context, opts *repo_model.FindReleasesOptions) return nil, err } - info.CommitStatus = git_model.CalcCombinedStatusState(statuses) + info.CombinedStatus = git_model.CalcCombinedStatus(statuses) info.CommitStatuses = statuses } diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 77f9cb8cca..094f4f3f18 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -564,7 +564,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { } } - commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, issues) + commitStatuses, combinedStatuses, err := pull_service.GetIssuesAllCommitStatus(ctx, issues) if err != nil { ctx.ServerError("GetIssuesLastCommitStatus", err) return @@ -630,7 +630,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { } return 0 } - ctx.Data["CommitLastStatus"] = lastStatus + ctx.Data["CombinedStatuses"] = combinedStatuses ctx.Data["CommitStatuses"] = commitStatuses ctx.Data["IssueStats"] = issueStats ctx.Data["ViewType"] = viewType diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index 89f3c6956f..d6eaf49aee 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -274,7 +274,7 @@ func NotificationSubscriptions(ctx *context.Context) { return } - commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, issues) + commitStatuses, combinedStatuses, err := pull_service.GetIssuesAllCommitStatus(ctx, issues) if err != nil { ctx.ServerError("GetIssuesAllCommitStatus", err) return @@ -284,19 +284,11 @@ func NotificationSubscriptions(ctx *context.Context) { git_model.CommitStatusesHideActionsURL(ctx, commitStatuses[key]) } } - ctx.Data["CommitLastStatus"] = lastStatus + ctx.Data["CombinedStatuses"] = combinedStatuses ctx.Data["CommitStatuses"] = commitStatuses ctx.Data["Issues"] = issues - ctx.Data["IssueRefEndNames"], ctx.Data["IssueRefURLs"] = issue_service.GetRefEndNamesAndURLs(issues, "") - commitStatus, err := pull_service.GetIssuesLastCommitStatus(ctx, issues) - if err != nil { - ctx.ServerError("GetIssuesLastCommitStatus", err) - return - } - ctx.Data["CommitStatus"] = commitStatus - approvalCounts, err := issues.GetApprovalCounts(ctx) if err != nil { ctx.ServerError("ApprovalCounts", err) diff --git a/services/pull/pull.go b/services/pull/pull.go index d36817c9b3..58195e3a4d 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -945,10 +945,10 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ return stringBuilder.String() } -// GetIssuesLastCommitStatus returns a map of issue ID to the most recent commit's latest status -func GetIssuesLastCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64]*git_model.CombinedStatus, error) { - _, lastStatus, err := GetIssuesAllCommitStatus(ctx, issues) - return lastStatus, err +// GetIssuesCombinedStatuses returns a map of issue ID to the most recent commit's latest status +func GetIssuesCombinedStatuses(ctx context.Context, issues issues_model.IssueList) (map[int64]*git_model.CombinedStatus, error) { + _, combinedStatuses, err := GetIssuesAllCommitStatus(ctx, issues) + return combinedStatuses, err } // GetIssuesAllCommitStatus returns a map of issue ID to a list of all statuses for the most recent commit as well as a map of issue ID to only the commit's latest status diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index fffe3a08cc..4b888a766a 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -25,7 +25,7 @@ {{svg "octicon-shield-lock"}} {{end}} - {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}} + {{template "repo/commit_statuses" dict "Status" (index $.CombinedStatuses .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}

{{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{ctx.RenderUtils.RenderCommitMessage .DefaultBranchBranch.DBBranch.CommitMessage .Repository}} · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DefaultBranchBranch.DBBranch.CommitTime}}{{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

@@ -101,7 +101,7 @@ {{svg "octicon-shield-lock"}} {{end}} - {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}} + {{template "repo/commit_statuses" dict "Status" (index $.CombinedStatuses .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}

{{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DBBranch.CommitID}} · {{ctx.RenderUtils.RenderCommitMessage .DBBranch.CommitMessage $.Repository}} · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DBBranch.CommitTime}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

{{end}} diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 7abd377108..10cac1945f 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -5,7 +5,7 @@
-

{{ctx.RenderUtils.RenderCommitMessage .Commit.Message $.Repository}}{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses}}

+

{{ctx.RenderUtils.RenderCommitMessage .Commit.Message $.Repository}}{{template "repo/commit_statuses" dict "Status" .CombinedStatus "Statuses" .CommitStatuses}}

{{if not $.PageIsWiki}}
diff --git a/templates/repo/commit_statuses.tmpl b/templates/repo/commit_statuses.tmpl index 1bbfb33105..0b2db9514d 100644 --- a/templates/repo/commit_statuses.tmpl +++ b/templates/repo/commit_statuses.tmpl @@ -9,6 +9,6 @@ {{end}}
- {{template "repo/pulls/status" (dict "CommitStatuses" .Statuses "CommitStatus" .Status)}} + {{template "repo/pulls/status" (dict "CommitStatuses" .Statuses "CombinedStatus" .Status)}}
{{end}} diff --git a/templates/repo/pulls/status.tmpl b/templates/repo/pulls/status.tmpl index 96030f9422..6c965e040c 100644 --- a/templates/repo/pulls/status.tmpl +++ b/templates/repo/pulls/status.tmpl @@ -6,18 +6,18 @@ * is_context_required: Used in pull request commit status check table */}} -{{if .CommitStatus}} +{{if .CombinedStatus}}
- {{if or (eq .CommitStatus.State "pending") (.MissingRequiredChecks)}} + {{if or (eq .CombinedStatus.State "pending") (.MissingRequiredChecks)}} {{ctx.Locale.Tr "repo.pulls.status_checking"}} - {{else if eq .CommitStatus.State "success"}} + {{else if eq .CombinedStatus.State "success"}} {{ctx.Locale.Tr "repo.pulls.status_checks_success"}} - {{else if eq .CommitStatus.State "warning"}} + {{else if eq .CombinedStatus.State "warning"}} {{ctx.Locale.Tr "repo.pulls.status_checks_warning"}} - {{else if eq .CommitStatus.State "failure"}} + {{else if eq .CombinedStatus.State "failure"}} {{ctx.Locale.Tr "repo.pulls.status_checks_failure"}} - {{else if eq .CommitStatus.State "error"}} + {{else if eq .CombinedStatus.State "error"}} {{ctx.Locale.Tr "repo.pulls.status_checks_error"}} {{else}} {{ctx.Locale.Tr "repo.pulls.status_checking"}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 1a7d911acb..bbfc30e4e2 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -33,7 +33,7 @@

{{if $.PageIsSingleTag}}{{$release.Title}}{{else}}{{$release.Title}}{{end}} - {{template "repo/commit_statuses" dict "Status" $info.CommitStatus "Statuses" $info.CommitStatuses "AdditionalClasses" "tw-flex"}} + {{template "repo/commit_statuses" dict "Status" $info.CombinedStatus "Statuses" $info.CommitStatuses "AdditionalClasses" "tw-flex"}} {{template "repo/release/label" (dict "Release" $release)}}

diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 30670c3b0f..df7da5e1de 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -16,7 +16,7 @@ {{.Title | ctx.RenderUtils.RenderIssueSimpleTitle}} {{if .IsPull}} {{if (index $.CommitStatuses .PullRequest.ID)}} - {{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID)}} + {{template "repo/commit_statuses" dict "Status" (index $.CombinedStatuses .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID)}} {{end}} {{end}}