Skip to content

Commit 3a2ae5c

Browse files
lunnylunny
committed
Some changes to templates
1 parent c9678ea commit 3a2ae5c

File tree

13 files changed

+26
-35
lines changed

13 files changed

+26
-35
lines changed

‎routers/web/repo/branch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func Branches(ctx *context.Context) {
8282

8383
ctx.Data["Keyword"] = kw
8484
ctx.Data["Branches"] = branches
85-
ctx.Data["CommitStatus"] = combinedStatuses
85+
ctx.Data["CombinedStatuses"] = combinedStatuses
8686
ctx.Data["CommitStatuses"] = commitStatuses
8787
ctx.Data["DefaultBranchBranch"] = defaultBranch
8888
pager := context.NewPagination(int(branchesCount), pageSize, page, 5)

‎routers/web/repo/commit.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ func Diff(ctx *context.Context) {
385385
git_model.CommitStatusesHideActionsURL(ctx, statuses)
386386
}
387387

388-
ctx.Data["CommitStatus"] = git_model.CalcCombinedStatus(statuses)
388+
ctx.Data["CombinedStatus"] = git_model.CalcCombinedStatus(statuses)
389389
ctx.Data["CommitStatuses"] = statuses
390390

391391
verification := asymkey_service.ParseCommitWithSignature(ctx, commit)

‎routers/web/repo/issue_list.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID, projectID int6
665665
}
666666
}
667667

668-
commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, issues)
668+
commitStatuses, combinedStatuses, err := pull_service.GetIssuesAllCommitStatus(ctx, issues)
669669
if err != nil {
670670
ctx.ServerError("GetIssuesAllCommitStatus", err)
671671
return
@@ -682,7 +682,7 @@ func prepareIssueFilterAndList(ctx *context.Context, milestoneID, projectID int6
682682
}
683683

684684
ctx.Data["Issues"] = issues
685-
ctx.Data["CommitLastStatus"] = lastStatus
685+
ctx.Data["CombinedStatuses"] = combinedStatuses
686686
ctx.Data["CommitStatuses"] = commitStatuses
687687

688688
// Get assignees.

‎routers/web/repo/release.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
repo_model "code.gitea.io/gitea/models/repo"
1717
"code.gitea.io/gitea/models/unit"
1818
user_model "code.gitea.io/gitea/models/user"
19-
"code.gitea.io/gitea/modules/commitstatus"
2019
"code.gitea.io/gitea/modules/git"
2120
"code.gitea.io/gitea/modules/gitrepo"
2221
"code.gitea.io/gitea/modules/markup/markdown"
@@ -72,7 +71,7 @@ func calReleaseNumCommitsBehind(repoCtx *context.Repository, release *repo_model
7271

7372
type ReleaseInfo struct {
7473
Release *repo_model.Release
75-
CommitStatus commitstatus.CombinedStatusState
74+
CombinedStatus *git_model.CombinedStatus
7675
CommitStatuses []*git_model.CommitStatus
7776
}
7877

@@ -136,7 +135,7 @@ func getReleaseInfos(ctx *context.Context, opts *repo_model.FindReleasesOptions)
136135
return nil, err
137136
}
138137

139-
info.CommitStatus = git_model.CalcCombinedStatusState(statuses)
138+
info.CombinedStatus = git_model.CalcCombinedStatus(statuses)
140139
info.CommitStatuses = statuses
141140
}
142141

‎routers/web/user/home.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
564564
}
565565
}
566566

567-
commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, issues)
567+
commitStatuses, combinedStatuses, err := pull_service.GetIssuesAllCommitStatus(ctx, issues)
568568
if err != nil {
569569
ctx.ServerError("GetIssuesLastCommitStatus", err)
570570
return
@@ -630,7 +630,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
630630
}
631631
return 0
632632
}
633-
ctx.Data["CommitLastStatus"] = lastStatus
633+
ctx.Data["CombinedStatuses"] = combinedStatuses
634634
ctx.Data["CommitStatuses"] = commitStatuses
635635
ctx.Data["IssueStats"] = issueStats
636636
ctx.Data["ViewType"] = viewType

‎routers/web/user/notification.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ func NotificationSubscriptions(ctx *context.Context) {
274274
return
275275
}
276276

277-
commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, issues)
277+
commitStatuses, combinedStatuses, err := pull_service.GetIssuesAllCommitStatus(ctx, issues)
278278
if err != nil {
279279
ctx.ServerError("GetIssuesAllCommitStatus", err)
280280
return
@@ -284,19 +284,11 @@ func NotificationSubscriptions(ctx *context.Context) {
284284
git_model.CommitStatusesHideActionsURL(ctx, commitStatuses[key])
285285
}
286286
}
287-
ctx.Data["CommitLastStatus"] = lastStatus
287+
ctx.Data["CombinedStatuses"] = combinedStatuses
288288
ctx.Data["CommitStatuses"] = commitStatuses
289289
ctx.Data["Issues"] = issues
290-
291290
ctx.Data["IssueRefEndNames"], ctx.Data["IssueRefURLs"] = issue_service.GetRefEndNamesAndURLs(issues, "")
292291

293-
commitStatus, err := pull_service.GetIssuesLastCommitStatus(ctx, issues)
294-
if err != nil {
295-
ctx.ServerError("GetIssuesLastCommitStatus", err)
296-
return
297-
}
298-
ctx.Data["CommitStatus"] = commitStatus
299-
300292
approvalCounts, err := issues.GetApprovalCounts(ctx)
301293
if err != nil {
302294
ctx.ServerError("ApprovalCounts", err)

‎services/pull/pull.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -945,10 +945,10 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ
945945
return stringBuilder.String()
946946
}
947947

948-
// GetIssuesLastCommitStatus returns a map of issue ID to the most recent commit's latest status
949-
func GetIssuesLastCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64]*git_model.CombinedStatus, error) {
950-
_, lastStatus, err := GetIssuesAllCommitStatus(ctx, issues)
951-
return lastStatus, err
948+
// GetIssuesCombinedStatuses returns a map of issue ID to the most recent commit's latest status
949+
func GetIssuesCombinedStatuses(ctx context.Context, issues issues_model.IssueList) (map[int64]*git_model.CombinedStatus, error) {
950+
_, combinedStatuses, err := GetIssuesAllCommitStatus(ctx, issues)
951+
return combinedStatuses, err
952952
}
953953

954954
// 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

‎templates/repo/branch/list.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<span data-tooltip-content="{{ctx.Locale.Tr "repo.settings.protected_branch"}}">{{svg "octicon-shield-lock"}}</span>
2626
{{end}}
2727
<button class="btn interact-fg tw-px-1" data-clipboard-text="{{.DefaultBranchBranch.DBBranch.Name}}" data-tooltip-content="{{ctx.Locale.Tr "copy_branch"}}">{{svg "octicon-copy" 14}}</button>
28-
{{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}
28+
{{template "repo/commit_statuses" dict "Status" (index $.CombinedStatuses .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}
2929
</div>
3030
<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{ctx.RenderUtils.RenderCommitMessage .DefaultBranchBranch.DBBranch.CommitMessage .Repository}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DefaultBranchBranch.DBBranch.CommitTime}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p>
3131
</td>
@@ -101,7 +101,7 @@
101101
<span data-tooltip-content="{{ctx.Locale.Tr "repo.settings.protected_branch"}}">{{svg "octicon-shield-lock"}}</span>
102102
{{end}}
103103
<button class="btn interact-fg tw-px-1" data-clipboard-text="{{.DBBranch.Name}}" data-tooltip-content="{{ctx.Locale.Tr "copy_branch"}}">{{svg "octicon-copy" 14}}</button>
104-
{{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}
104+
{{template "repo/commit_statuses" dict "Status" (index $.CombinedStatuses .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}
105105
</div>
106106
<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{$.RepoLink}}/commit/{{PathEscape .DBBranch.CommitID}}">{{ShortSha .DBBranch.CommitID}}</a> · <span class="commit-message">{{ctx.RenderUtils.RenderCommitMessage .DBBranch.CommitMessage $.Repository}}</span> · {{ctx.Locale.Tr "org.repo_updated"}} {{DateUtils.TimeSince .DBBranch.CommitTime}}{{if .DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}} &nbsp;{{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}</p>
107107
{{end}}

‎templates/repo/commit_page.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="ui container fluid padded">
66
<div class="ui top attached header clearing segment tw-relative commit-header">
77
<div class="tw-flex tw-mb-4 tw-gap-1">
8-
<h3 class="tw-mb-0 tw-flex-1"><span class="commit-summary" title="{{.Commit.Summary}}">{{ctx.RenderUtils.RenderCommitMessage .Commit.Message $.Repository}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses}}</h3>
8+
<h3 class="tw-mb-0 tw-flex-1"><span class="commit-summary" title="{{.Commit.Summary}}">{{ctx.RenderUtils.RenderCommitMessage .Commit.Message $.Repository}}</span>{{template "repo/commit_statuses" dict "Status" .CombinedStatus "Statuses" .CommitStatuses}}</h3>
99
{{if not $.PageIsWiki}}
1010
<div class="commit-header-buttons">
1111
<a class="ui primary tiny button" href="{{.SourcePath}}">

‎templates/repo/commit_statuses.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
</span>
1010
{{end}}
1111
<div class="tippy-target">
12-
{{template "repo/pulls/status" (dict "CommitStatuses" .Statuses "CommitStatus" .Status)}}
12+
{{template "repo/pulls/status" (dict "CommitStatuses" .Statuses "CombinedStatus" .Status)}}
1313
</div>
1414
{{end}}

0 commit comments

Comments
 (0)