From c5410805a27bbf4e83632e2198189882b3ab77f3 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 13 Jun 2022 16:15:34 +0800 Subject: [PATCH 1/2] Fix mirror template bug --- modules/context/repo.go | 20 ++++++-------------- templates/repo/header.tmpl | 7 ++++--- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/modules/context/repo.go b/modules/context/repo.go index 05ced909a8a4e..ea23ba6cbdcba 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -379,24 +379,16 @@ func repoAssignment(ctx *Context, repo *repo_model.Repository) { ctx.Data["Permission"] = &ctx.Repo.Permission if repo.IsMirror { - - // Check if the mirror has finsihed migrationg, only then we can - // lookup the mirror informtation the database. - finishedMigrating, err := models.HasFinishedMigratingTask(repo.ID) - if err != nil { - ctx.ServerError("HasFinishedMigratingTask", err) - return - } - if finishedMigrating { - ctx.Repo.Mirror, err = repo_model.GetMirrorByRepoID(ctx, repo.ID) - if err != nil { - ctx.ServerError("GetMirrorByRepoID", err) - return - } + ctx.Repo.Mirror, err = repo_model.GetMirrorByRepoID(ctx, repo.ID) + if err == nil { ctx.Repo.Mirror.Repo = repo + ctx.Data["IsPullMirror"] = true ctx.Data["MirrorEnablePrune"] = ctx.Repo.Mirror.EnablePrune ctx.Data["MirrorInterval"] = ctx.Repo.Mirror.Interval ctx.Data["Mirror"] = ctx.Repo.Mirror + } else if err != nil && err != repo_model.ErrMirrorNotExist { + ctx.ServerError("GetMirrorByRepoID", err) + return } } diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index cfac37cd115b0..029e9a186f1ac 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -37,9 +37,10 @@ {{end}} - {{if .IsMirror}} - {{$address := MirrorRemoteAddress $.Context . $.Mirror.GetRemoteName}} -
{{$.i18n.Tr "repo.mirror_from"}} {{$address.Address}}
{{end}} + {{if $.IsPullMirror}} + {{$address := MirrorRemoteAddress $.Context . $.Mirror.GetRemoteName}} +
{{$.i18n.Tr "repo.mirror_from"}} {{$address.Address}}
+ {{end}} {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{.BaseRepo.FullName}}
{{end}} {{if .IsGenerated}}
{{$.i18n.Tr "repo.generated_from"}} {{.TemplateRepo.FullName}}
{{end}} From 5562da7ca7e4b65e929c81d350cf2b5ddafcf27e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 13 Jun 2022 21:55:29 +0800 Subject: [PATCH 2/2] Update modules/context/repo.go Co-authored-by: delvh --- modules/context/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/context/repo.go b/modules/context/repo.go index 0f23dfc397ee4..8e75ad07d58f2 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -387,7 +387,7 @@ func repoAssignment(ctx *Context, repo *repo_model.Repository) { ctx.Data["MirrorEnablePrune"] = ctx.Repo.Mirror.EnablePrune ctx.Data["MirrorInterval"] = ctx.Repo.Mirror.Interval ctx.Data["Mirror"] = ctx.Repo.Mirror - } else if err != nil && err != repo_model.ErrMirrorNotExist { + } else if err != repo_model.ErrMirrorNotExist { ctx.ServerError("GetMirrorByRepoID", err) return }