Skip to content

Commit eefbabd

Browse files
committed
refactor tmpl data
1 parent 96edae9 commit eefbabd

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

routers/web/repo/issue_view.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,9 @@ func ViewIssue(ctx *context.Context) {
437437

438438
func ViewPullMergeBox(ctx *context.Context) {
439439
issue := prepareIssueViewLoad(ctx)
440+
if ctx.Written() {
441+
return
442+
}
440443
if !issue.IsPull {
441444
ctx.NotFound(nil)
442445
return

routers/web/repo/pull.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,11 @@ func prepareMergedViewPullInfo(ctx *context.Context, issue *issues_model.Issue)
313313
}
314314

315315
type pullCommitStatusCheckData struct {
316-
MissingRequiredChecks []string
317-
IsContextRequired func(string) bool
318-
RequireApproval bool
319-
CanApprove bool
320-
ApproveLink string
316+
MissingRequiredChecks []string // list of missing required checks
317+
IsContextRequired func(string) bool // function to check whether a context is required
318+
RequireApproval bool // whether approval is required for workflow runs
319+
CanApprove bool // whether the user can approve workflow runs
320+
ApproveLink string // link to approve all checks
321321
}
322322

323323
// prepareViewPullInfo show meta information for a pull request preview page

templates/repo/pulls/status.tmpl

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22
* CommitStatus: summary of all commit status state
33
* CommitStatuses: all commit status elements
44
* ShowHideChecks: whether use a button to show/hide the checks
5-
* StatusCheckData: additional status check data for repo/issue/view_content/pull_merge_box
6-
* MissingRequiredChecks: list of missing required checks
7-
* IsContextRequired: function to check whether a context is required
8-
* RequireApproval: whether approval is required for workflow runs
9-
* CanApprove: whether the user can approve workflow runs
10-
* ApproveLink: link to approve all checks
5+
* StatusCheckData: additional status check data, see backend pullCommitStatusCheckData struct
116
*/}}
12-
7+
{{$statusCheckData := .StatusCheckData}}
138
{{if .CommitStatus}}
149
<div class="commit-status-panel">
1510
<div class="ui top attached header commit-status-header">
@@ -28,8 +23,8 @@
2823
{{end}}
2924

3025
<div class="ui right">
31-
{{if and .StatusCheckData .StatusCheckData.RequireApproval .StatusCheckData.CanApprove}}
32-
<button class="ui basic small compact button link-action" data-url="{{.StatusCheckData.ApproveLink}}">
26+
{{if and $statusCheckData $statusCheckData.RequireApproval $statusCheckData.CanApprove}}
27+
<button class="ui basic small compact button link-action" data-url="{{$statusCheckData.ApproveLink}}">
3328
{{ctx.Locale.Tr "repo.pulls.status_checks_approve_all"}}
3429
</button>
3530
{{end}}
@@ -48,15 +43,15 @@
4843
{{template "repo/commit_status" .}}
4944
<div class="status-context gt-ellipsis">{{.Context}} <span class="text light-2">{{.Description}}</span></div>
5045
<div class="ui status-details">
51-
{{if and $.StatusCheckData $.StatusCheckData.IsContextRequired}}
52-
{{if (call $.StatusCheckData.IsContextRequired .Context)}}<div class="ui label">{{ctx.Locale.Tr "repo.pulls.status_checks_requested"}}</div>{{end}}
46+
{{if and $statusCheckData $statusCheckData.IsContextRequired}}
47+
{{if (call $statusCheckData.IsContextRequired .Context)}}<div class="ui label">{{ctx.Locale.Tr "repo.pulls.status_checks_requested"}}</div>{{end}}
5348
{{end}}
5449
<span>{{if .TargetURL}}<a href="{{.TargetURL}}">{{ctx.Locale.Tr "repo.pulls.status_checks_details"}}</a>{{end}}</span>
5550
</div>
5651
</div>
5752
{{end}}
58-
{{if .StatusCheckData}}
59-
{{range .StatusCheckData.MissingRequiredChecks}}
53+
{{if $statusCheckData}}
54+
{{range $statusCheckData.MissingRequiredChecks}}
6055
<div class="commit-status-item">
6156
{{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}}
6257
<div class="status-context gt-ellipsis">{{.}}</div>

0 commit comments

Comments
 (0)