realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Fix migration context data (#14910)

Browse source 
* Unified context data.

* Changed method name.
This commit is contained in:
KN4CK3R 2021-03-07 20:21:09 +01:00 committed by GitHub
parent 9b261f52f0
commit 40aca73347
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
routers/repo/migrate.go
View file

@ -32,8 +32,10 @@ func Migrate(ctx *context.Context) {
return return
} }
ctx.Data["Services"] = append([]structs.GitServiceType{structs.PlainGitService}, structs.SupportedFullGitService...) serviceType := structs.GitServiceType(ctx.QueryInt("service_type"))
serviceType := ctx.QueryInt("service_type")
setMigrationContextData(ctx, serviceType)
if serviceType == 0 { if serviceType == 0 {
ctx.Data["Org"] = ctx.Query("org") ctx.Data["Org"] = ctx.Query("org")
ctx.Data["Mirror"] = ctx.Query("mirror") ctx.Data["Mirror"] = ctx.Query("mirror")
@ -42,10 +44,7 @@ func Migrate(ctx *context.Context) {
return return
} }
ctx.Data["Title"] = ctx.Tr("new_migrate")
ctx.Data["private"] = getRepoPrivate(ctx) ctx.Data["private"] = getRepoPrivate(ctx)
ctx.Data["IsForcedPrivate"] = setting.Repository.ForcePrivate
ctx.Data["DisableMirrors"] = setting.Repository.DisableMirrors
ctx.Data["mirror"] = ctx.Query("mirror") == "1" ctx.Data["mirror"] = ctx.Query("mirror") == "1"
ctx.Data["wiki"] = ctx.Query("wiki") == "1" ctx.Data["wiki"] = ctx.Query("wiki") == "1"
ctx.Data["milestones"] = ctx.Query("milestones") == "1" ctx.Data["milestones"] = ctx.Query("milestones") == "1"
@ -53,9 +52,6 @@ func Migrate(ctx *context.Context) {
ctx.Data["issues"] = ctx.Query("issues") == "1" ctx.Data["issues"] = ctx.Query("issues") == "1"
ctx.Data["pull_requests"] = ctx.Query("pull_requests") == "1" ctx.Data["pull_requests"] = ctx.Query("pull_requests") == "1"
ctx.Data["releases"] = ctx.Query("releases") == "1" ctx.Data["releases"] = ctx.Query("releases") == "1"
ctx.Data["LFSActive"] = setting.LFS.StartServer
// Plain git should be first
ctx.Data["service"] = structs.GitServiceType(serviceType)
ctxUser := checkContextUser(ctx, ctx.QueryInt64("org")) ctxUser := checkContextUser(ctx, ctx.QueryInt64("org"))
if ctx.Written() { if ctx.Written() {
@ -63,7 +59,7 @@ func Migrate(ctx *context.Context) {
} }
ctx.Data["ContextUser"] = ctxUser ctx.Data["ContextUser"] = ctxUser
ctx.HTML(200, base.TplName("repo/migrate/"+structs.GitServiceType(serviceType).Name())) ctx.HTML(200, base.TplName("repo/migrate/"+serviceType.Name()))
} }
func handleMigrateError(ctx *context.Context, owner *models.User, err error, name string, tpl base.TplName, form *auth.MigrateRepoForm) { func handleMigrateError(ctx *context.Context, owner *models.User, err error, name string, tpl base.TplName, form *auth.MigrateRepoForm) {
@ -125,12 +121,9 @@ func MigratePost(ctx *context.Context) {
return return
} }
ctx.Data["Title"] = ctx.Tr("new_migrate") serviceType := structs.GitServiceType(form.Service)
// Plain git should be first
ctx.Data["service"] = structs.GitServiceType(form.Service)
ctx.Data["Services"] = append([]structs.GitServiceType{structs.PlainGitService}, structs.SupportedFullGitService...)
tpl := base.TplName("repo/migrate/" + structs.GitServiceType(form.Service).Name()) setMigrationContextData(ctx, serviceType)
ctxUser := checkContextUser(ctx, form.UID) ctxUser := checkContextUser(ctx, form.UID)
if ctx.Written() { if ctx.Written() {
@ -138,6 +131,8 @@ func MigratePost(ctx *context.Context) {
} }
ctx.Data["ContextUser"] = ctxUser ctx.Data["ContextUser"] = ctxUser
tpl := base.TplName("repo/migrate/" + serviceType.Name())
if ctx.HasError() { if ctx.HasError() {
ctx.HTML(200, tpl) ctx.HTML(200, tpl)
return return
@ -166,7 +161,7 @@ func MigratePost(ctx *context.Context) {
var opts = migrations.MigrateOptions{ var opts = migrations.MigrateOptions{
OriginalURL: form.CloneAddr, OriginalURL: form.CloneAddr,
GitServiceType: structs.GitServiceType(form.Service), GitServiceType: serviceType,
CloneAddr: remoteAddr, CloneAddr: remoteAddr,
RepoName: form.RepoName, RepoName: form.RepoName,
Description: form.Description, Description: form.Description,
@ -206,3 +201,15 @@ func MigratePost(ctx *context.Context) {
handleMigrateError(ctx, ctxUser, err, "MigratePost", tpl, form) handleMigrateError(ctx, ctxUser, err, "MigratePost", tpl, form)
} }
func setMigrationContextData(ctx *context.Context, serviceType structs.GitServiceType) {
ctx.Data["Title"] = ctx.Tr("new_migrate")
ctx.Data["LFSActive"] = setting.LFS.StartServer
ctx.Data["IsForcedPrivate"] = setting.Repository.ForcePrivate
ctx.Data["DisableMirrors"] = setting.Repository.DisableMirrors
// Plain git should be first
ctx.Data["Services"] = append([]structs.GitServiceType{structs.PlainGitService}, structs.SupportedFullGitService...)
ctx.Data["service"] = serviceType
}