diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-06-14 00:12:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-13 18:12:59 +0200 |
| commit | ff82a1831521bb2a9d91884eb2bc426a6403b0ed (patch) | |
| tree | 9d2ec888cd66a5ff4b988eb4cb5760b60c8996e3 | |
| parent | 3c6c1507403b659a9ed790df19311a9f83175364 (diff) | |
| download | gitea-ff82a1831521bb2a9d91884eb2bc426a6403b0ed.tar.gz gitea-ff82a1831521bb2a9d91884eb2bc426a6403b0ed.zip | |
Fix mirror template bug (#19959)
* Fix mirror template bug
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
| -rw-r--r-- | modules/context/repo.go | 20 | ||||
| -rw-r--r-- | 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 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 } } diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index cfac37cd11..029e9a186f 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -37,9 +37,10 @@ {{end}} </div> </div> - {{if .IsMirror}} - {{$address := MirrorRemoteAddress $.Context . $.Mirror.GetRemoteName}} - <div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener noreferrer" href="{{$address.Address}}">{{$address.Address}}</a></div>{{end}} + {{if $.IsPullMirror}} + {{$address := MirrorRemoteAddress $.Context . $.Mirror.GetRemoteName}} + <div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener noreferrer" href="{{$address.Address}}">{{$address.Address}}</a></div> + {{end}} {{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.Link}}">{{.BaseRepo.FullName}}</a></div>{{end}} {{if .IsGenerated}}<div class="fork-flag">{{$.i18n.Tr "repo.generated_from"}} <a href="{{.TemplateRepo.Link}}">{{.TemplateRepo.FullName}}</a></div>{{end}} </div> |