Skip to content

Commit 3a749fc

Browse files
yp05327wxiaoguang
andauthored
Fix 500 error when error occurred in migration page (#33256)
The template should be `repo/migrate/{service type}` But input element `service` is not in the form. Related: #33081 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
1 parent 4672ddc commit 3a749fc

File tree

10 files changed

+32
-10
lines changed

10 files changed

+32
-10
lines changed

templates/repo/migrate/codebase.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
<div class="ui container medium-width">
44
<h3 class="ui top attached header">
55
{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
6-
<input id="service_type" type="hidden" name="service" value="{{.service}}">
76
</h3>
87
<div class="ui attached segment">
98
{{template "base/alert" .}}
109
<form class="ui form left-right-form" action="{{.Link}}" method="post">
1110
{{template "base/disable_form_autofill"}}
1211
{{.CsrfTokenHtml}}
12+
13+
<input id="service_type" type="hidden" name="service" value="{{.service}}">
14+
1315
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
1416
<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
1517
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>

templates/repo/migrate/codecommit.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
<div class="ui container medium-width">
44
<h3 class="ui top attached header">
55
{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
6-
<input id="service_type" type="hidden" name="service" value="{{.service}}">
76
</h3>
87
<div class="ui attached segment">
98
{{template "base/alert" .}}
109
<form class="ui form left-right-form" action="{{.Link}}" method="post">
1110
{{template "base/disable_form_autofill"}}
1211
{{.CsrfTokenHtml}}
12+
13+
<input id="service_type" type="hidden" name="service" value="{{.service}}">
14+
1315
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
1416
<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
1517
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>

templates/repo/migrate/git.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
<div class="ui container medium-width">
44
<h3 class="ui top attached header">
55
{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
6-
<input id="service_type" type="hidden" name="service" value="{{.service}}">
76
</h3>
87
<div class="ui attached segment">
98
{{template "base/alert" .}}
109
<form class="ui form left-right-form" action="{{.Link}}" method="post">
1110
{{template "base/disable_form_autofill"}}
1211
{{.CsrfTokenHtml}}
12+
13+
<input id="service_type" type="hidden" name="service" value="{{.service}}">
14+
1315
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
1416
<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
1517
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>

templates/repo/migrate/gitbucket.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
<div class="ui container medium-width">
44
<h3 class="ui top attached header">
55
{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
6-
<input id="service_type" type="hidden" name="service" value="{{.service}}">
76
</h3>
87
<div class="ui attached segment">
98
{{template "base/alert" .}}
109
<form class="ui form left-right-form" action="{{.Link}}" method="post">
1110
{{template "base/disable_form_autofill"}}
1211
{{.CsrfTokenHtml}}
12+
13+
<input id="service_type" type="hidden" name="service" value="{{.service}}">
14+
1315
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
1416
<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
1517
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>

templates/repo/migrate/gitea.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
<div class="ui container medium-width">
44
<h3 class="ui top attached header">
55
{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
6-
<input id="service_type" type="hidden" name="service" value="{{.service}}">
76
</h3>
87
<div class="ui attached segment">
98
{{template "base/alert" .}}
109
<form class="ui form left-right-form" action="{{.Link}}" method="post">
1110
{{.CsrfTokenHtml}}
11+
12+
<input id="service_type" type="hidden" name="service" value="{{.service}}">
13+
1214
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
1315
<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
1416
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>

templates/repo/migrate/github.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
<div class="ui container medium-width">
44
<h3 class="ui top attached header">
55
{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
6-
<input id="service_type" type="hidden" name="service" value="{{.service}}">
76
</h3>
87
<div class="ui attached segment">
98
{{template "base/alert" .}}
109
<form class="ui form left-right-form" action="{{.Link}}" method="post">
1110
{{.CsrfTokenHtml}}
11+
12+
<input id="service_type" type="hidden" name="service" value="{{.service}}">
13+
1214
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
1315
<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
1416
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>

templates/repo/migrate/gitlab.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
<div class="ui container medium-width">
44
<h3 class="ui top attached header">
55
{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
6-
<input id="service_type" type="hidden" name="service" value="{{.service}}">
76
</h3>
87
<div class="ui attached segment">
98
{{template "base/alert" .}}
109
<form class="ui form left-right-form" action="{{.Link}}" method="post">
1110
{{.CsrfTokenHtml}}
11+
12+
<input id="service_type" type="hidden" name="service" value="{{.service}}">
13+
1214
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
1315
<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
1416
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>

templates/repo/migrate/gogs.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
<div class="ui container medium-width">
44
<h3 class="ui top attached header">
55
{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
6-
<input id="service_type" type="hidden" name="service" value="{{.service}}">
76
</h3>
87
<div class="ui attached segment">
98
{{template "base/alert" .}}
109
<form class="ui form left-right-form" action="{{.Link}}" method="post">
1110
{{.CsrfTokenHtml}}
11+
12+
<input id="service_type" type="hidden" name="service" value="{{.service}}">
13+
1214
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
1315
<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
1416
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>

templates/repo/migrate/onedev.tmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
<div class="ui container medium-width">
44
<h3 class="ui top attached header">
55
{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
6-
<input id="service_type" type="hidden" name="service" value="{{.service}}">
76
</h3>
87
<div class="ui attached segment">
98
{{template "base/alert" .}}
109
<form class="ui form left-right-form" action="{{.Link}}" method="post">
1110
{{template "base/disable_form_autofill"}}
1211
{{.CsrfTokenHtml}}
12+
13+
<input id="service_type" type="hidden" name="service" value="{{.service}}">
14+
1315
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
1416
<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
1517
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>

tests/integration/migrate_test.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,12 @@ func TestMigrateGiteaForm(t *testing.T) {
7979
resp := session.MakeRequest(t, req, http.StatusOK)
8080
// Step 2: load the form
8181
htmlDoc := NewHTMLParser(t, resp.Body)
82-
link, exists := htmlDoc.doc.Find(`form.ui.form[action^="/repo/migrate"]`).Attr("action")
82+
form := htmlDoc.doc.Find(`form.ui.form[action^="/repo/migrate"]`)
83+
link, exists := form.Attr("action")
8384
assert.True(t, exists, "The template has changed")
85+
serviceInput, exists := form.Find(`input[name="service"]`).Attr("value")
86+
assert.True(t, exists)
87+
assert.EqualValues(t, fmt.Sprintf("%d", structs.GiteaService), serviceInput)
8488
// Step 4: submit the migration to only migrate issues
8589
migratedRepoName := "otherrepo"
8690
req = NewRequestWithValues(t, "POST", link, map[string]string{

0 commit comments

Comments
 (0)