Skip to content

Commit a5f8cae

Browse files
committed
fix: rename to body
1 parent 7f85a48 commit a5f8cae

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

routers/web/repo/issue.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,21 +1664,21 @@ func ViewIssue(ctx *context.Context) {
16641664

16651665
ctx.Data["MergeStyle"] = mergeStyle
16661666

1667-
defaultMergeMessage, defaultMergeDetail, err := pull_service.GetDefaultMergeMessage(ctx, ctx.Repo.GitRepo, pull, mergeStyle)
1667+
defaultMergeMessage, defaultMergeBody, err := pull_service.GetDefaultMergeMessage(ctx, ctx.Repo.GitRepo, pull, mergeStyle)
16681668
if err != nil {
16691669
ctx.ServerError("GetDefaultMergeMessage", err)
16701670
return
16711671
}
16721672
ctx.Data["DefaultMergeMessage"] = defaultMergeMessage
1673-
ctx.Data["DefaultMergeDetail"] = defaultMergeDetail
1673+
ctx.Data["DefaultMergeBody"] = defaultMergeBody
16741674

16751675
defaultSquashMergeMessage, defaultSquashMergeDetail, err := pull_service.GetDefaultMergeMessage(ctx, ctx.Repo.GitRepo, pull, repo_model.MergeStyleSquash)
16761676
if err != nil {
16771677
ctx.ServerError("GetDefaultSquashMergeMessage", err)
16781678
return
16791679
}
16801680
ctx.Data["DefaultSquashMergeMessage"] = defaultSquashMergeMessage
1681-
ctx.Data["DefaultSquashMergeDetail"] = defaultSquashMergeDetail
1681+
ctx.Data["DefaultSquashMergeBody"] = defaultSquashMergeBody
16821682

16831683
if err = pull.LoadProtectedBranch(ctx); err != nil {
16841684
ctx.ServerError("LoadProtectedBranch", err)

services/pull/merge.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ func GetDefaultMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr
107107
vars["ClosingIssues"] = ""
108108
}
109109
}
110-
message, detail := expandDefaultMergeMessage(templateContent, vars)
111-
return message, detail, nil
110+
message, body := expandDefaultMergeMessage(templateContent, vars)
111+
return message, body, nil
112112
}
113113
}
114114

services/pull/merge_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ func Test_expandDefaultMergeMessage(t *testing.T) {
1515
vars map[string]string
1616
}
1717
tests := []struct {
18-
name string
19-
args args
20-
want string
21-
want1 string
18+
name string
19+
args args
20+
want string
21+
wantBody string
2222
}{
2323
{
2424
name: "single line",
@@ -29,8 +29,8 @@ func Test_expandDefaultMergeMessage(t *testing.T) {
2929
"PullRequestDescription": "Pull\nRequest\nDescription\n",
3030
},
3131
},
32-
want: "Merge PullRequestTitle",
33-
want1: "",
32+
want: "Merge PullRequestTitle",
33+
wantBody: "",
3434
},
3535
{
3636
name: "multiple lines",
@@ -41,8 +41,8 @@ func Test_expandDefaultMergeMessage(t *testing.T) {
4141
"PullRequestDescription": "Pull\nRequest\nDescription\n",
4242
},
4343
},
44-
want: "Merge PullRequestTitle",
45-
want1: "Description:\n\nPull\nRequest\nDescription\n",
44+
want: "Merge PullRequestTitle",
45+
wantBody: "Description:\n\nPull\nRequest\nDescription\n",
4646
},
4747
{
4848
name: "leading newlines",
@@ -53,15 +53,15 @@ func Test_expandDefaultMergeMessage(t *testing.T) {
5353
"PullRequestDescription": "Pull\nRequest\nDescription\n",
5454
},
5555
},
56-
want: "Merge PullRequestTitle",
57-
want1: "Description:\n\nPull\nRequest\nDescription\n",
56+
want: "Merge PullRequestTitle",
57+
wantBody: "Description:\n\nPull\nRequest\nDescription\n",
5858
},
5959
}
6060
for _, tt := range tests {
6161
t.Run(tt.name, func(t *testing.T) {
6262
got, got1 := expandDefaultMergeMessage(tt.args.template, tt.args.vars)
6363
assert.Equalf(t, tt.want, got, "expandDefaultMergeMessage(%v, %v)", tt.args.template, tt.args.vars)
64-
assert.Equalf(t, tt.want1, got1, "expandDefaultMergeMessage(%v, %v)", tt.args.template, tt.args.vars)
64+
assert.Equalf(t, tt.wantBody, got1, "expandDefaultMergeMessage(%v, %v)", tt.args.template, tt.args.vars)
6565
})
6666
}
6767
}

templates/repo/issue/view_content/pull.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@
343343
(() => {
344344
const defaultMergeTitle = {{.DefaultMergeMessage}};
345345
const defaultSquashMergeTitle = {{.DefaultSquashMergeMessage}};
346-
const defaultMergeMessage = {{if .DefaultMergeDetail}}{{.DefaultMergeDetail}}{{else}}'Reviewed-on: ' + {{$.Issue.HTMLURL}} + '\n' + {{$approvers}}{{end}};
347-
const defaultSquashMergeMessage = {{if .DefaultSquashMergeDetail}}{{.DefaultSquashMergeDetail}}{{else}}'Reviewed-on: ' + {{$.Issue.HTMLURL}} + '\n' + {{$approvers}}{{end}};
346+
const defaultMergeMessage = {{if .DefaultMergeBody}}{{.DefaultMergeBody}}{{else}}'Reviewed-on: ' + {{$.Issue.HTMLURL}} + '\n' + {{$approvers}}{{end}};
347+
const defaultSquashMergeMessage = {{if .DefaultSquashMergeBody}}{{.DefaultSquashMergeBody}}{{else}}'Reviewed-on: ' + {{$.Issue.HTMLURL}} + '\n' + {{$approvers}}{{end}};
348348
const mergeForm = {
349349
'baseLink': {{.Link}},
350350
'textCancel': {{$.locale.Tr "cancel"}},

0 commit comments

Comments
 (0)