From e3b1c3db6b877d1f2fc0ca2dc96a6426b515063c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 17 Jun 2022 09:54:10 +0800 Subject: [PATCH 1/3] Fix render bug --- routers/web/repo/view.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index fe60cf44c7c7d..16c201112ecf3 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -357,7 +357,7 @@ func renderReadmeFile(ctx *context.Context, readmeFile *namedBlob, readmeTreelin var result strings.Builder err := markup.Render(&markup.RenderContext{ Ctx: ctx, - RelativePath: ctx.Repo.TreePath, + RelativePath: path.Join(ctx.Repo.TreePath, readmeFile.name), URLPrefix: readmeTreelink, Metas: ctx.Repo.Repository.ComposeDocumentMetas(), GitRepo: ctx.Repo.GitRepo, From 685d47c2fa518e80a9cbf166b55d4b626c7c0860 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 17 Jun 2022 10:03:54 +0800 Subject: [PATCH 2/3] add some comment --- routers/web/repo/view.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 16c201112ecf3..9378fc21c9f8b 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -357,7 +357,7 @@ func renderReadmeFile(ctx *context.Context, readmeFile *namedBlob, readmeTreelin var result strings.Builder err := markup.Render(&markup.RenderContext{ Ctx: ctx, - RelativePath: path.Join(ctx.Repo.TreePath, readmeFile.name), + RelativePath: path.Join(ctx.Repo.TreePath, readmeFile.name), // For README renderer, ctx.Repo.TreePath just the path without file name URLPrefix: readmeTreelink, Metas: ctx.Repo.Repository.ComposeDocumentMetas(), GitRepo: ctx.Repo.GitRepo, From f2226afd4c099958c3f7c06590c4725f433cdb14 Mon Sep 17 00:00:00 2001 From: zeripath Date: Fri, 17 Jun 2022 06:29:11 +0100 Subject: [PATCH 3/3] Update routers/web/repo/view.go --- routers/web/repo/view.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 9378fc21c9f8b..c327f959f6556 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -357,7 +357,7 @@ func renderReadmeFile(ctx *context.Context, readmeFile *namedBlob, readmeTreelin var result strings.Builder err := markup.Render(&markup.RenderContext{ Ctx: ctx, - RelativePath: path.Join(ctx.Repo.TreePath, readmeFile.name), // For README renderer, ctx.Repo.TreePath just the path without file name + RelativePath: path.Join(ctx.Repo.TreePath, readmeFile.name), // ctx.Repo.TreePath is the directory not the Readme so we must append the Readme filename (and path). URLPrefix: readmeTreelink, Metas: ctx.Repo.Repository.ComposeDocumentMetas(), GitRepo: ctx.Repo.GitRepo,