From ff82a1831521bb2a9d91884eb2bc426a6403b0ed Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 14 Jun 2022 00:12:59 +0800 Subject: [PATCH 01/15] Fix mirror template bug (#19959) * Fix mirror template bug Co-authored-by: wxiaoguang Co-authored-by: delvh --- 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 c2b8306b9d9b..8e75ad07d58f 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 } } diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index cfac37cd115b..029e9a186f1a 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 0d7eda511f57a5327706129f9fc25a3fa5c1a898 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 14 Jun 2022 02:46:39 +0800 Subject: [PATCH 02/15] Fix aria for logo (#19955) Co-authored-by: 6543 <6543@obermui.de> --- templates/base/head_navbar.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 37a579142c56..fab1d2d0b11e 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -1,7 +1,7 @@