From ff82a1831521bb2a9d91884eb2bc426a6403b0ed Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 14 Jun 2022 00:12:59 +0800 Subject: Fix mirror template bug (#19959) * Fix mirror template bug Co-authored-by: wxiaoguang Co-authored-by: delvh --- modules/context/repo.go | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'modules/context') diff --git a/modules/context/repo.go b/modules/context/repo.go index c2b8306b9d..8e75ad07d5 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -380,24 +380,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 != repo_model.ErrMirrorNotExist { + ctx.ServerError("GetMirrorByRepoID", err) + return } } -- cgit v1.2.3