Infrastructure/forgejo
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-25 08:54:17 -05:00
Code Issues Activity

Fix rendering of non-markdown readme files

Browse source
This commit is contained in:
Odin Ugedal 2016-10-13 20:17:06 +02:00
parent 6e4252dad4
commit 530f6c1da4
No known key found for this signature in database
GPG key ID: AFF9C8242CF7A7AF
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routers/repo/view.go
View file

@ -88,6 +88,9 @@ func renderDirectory(ctx *context.Context, treeLink string) {
ctx.Data["IsMarkdown"] = true ctx.Data["IsMarkdown"] = true
buf = markdown.Render(buf, treeLink, ctx.Repo.Repository.ComposeMetas()) buf = markdown.Render(buf, treeLink, ctx.Repo.Repository.ComposeMetas())
default: default:
// FIXME This is the only way to show non-markdown files
// instead of a broken "View Raw" link
ctx.Data["IsMarkdown"] = true
buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1) buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1)
} }
ctx.Data["FileContent"] = string(buf) ctx.Data["FileContent"] = string(buf)
@ -156,8 +159,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
readmeExist := isMarkdown || markdown.IsReadmeFile(blob.Name()) readmeExist := isMarkdown || markdown.IsReadmeFile(blob.Name())
ctx.Data["ReadmeExist"] = readmeExist ctx.Data["ReadmeExist"] = readmeExist
if readmeExist { if readmeExist && isMarkdown {
// TODO: don't need to render if it's a README but not Markdown file.
ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas())) ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas()))
} else { } else {
// Building code view blocks with line number on server side. // Building code view blocks with line number on server side.