Skip to content

fix markdown commit link generation #4545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

fix markdown commit link generation #4545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bbc8bbd
fix markdown commit link generation
adelowo Jul 29, 2018
c80a617
Merge branch 'master' into fix_commit_link_in_markdown
adelowo Aug 16, 2018
9b25330
Merge branch 'master' into fix_commit_link_in_markdown
adelowo Aug 21, 2018
ea9f17a
Merge branch 'master' into fix_commit_link_in_markdown
adelowo Aug 22, 2018
5dddf41
Merge branch 'master' into fix_commit_link_in_markdown
adelowo Aug 24, 2018
151bcf2
Merge branch 'master' into fix_commit_link_in_markdown
adelowo Sep 4, 2018
69c19e3
Merge branch 'master' into fix_commit_link_in_markdown
lafriks Sep 17, 2018
a222765
Merge branch 'master' into fix_commit_link_in_markdown
adelowo Sep 18, 2018
b7d2590
Merge remote-tracking branch 'origin/master' into fix_commit_link_in_…
adelowo Oct 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions routers/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"fmt"
gotemplate "html/template"
"io/ioutil"
"path"
"strconv"
"strings"

Expand All @@ -36,7 +35,7 @@ const (
tplForks base.TplName = "repo/forks"
)

func renderDirectory(ctx *context.Context, treeLink string) {
func renderDirectory(ctx *context.Context) {
tree, err := ctx.Repo.Commit.SubTree(ctx.Repo.TreePath)
if err != nil {
ctx.NotFoundOrServerError("Repo.Commit.SubTree", git.IsErrNotExist, err)
Expand Down Expand Up @@ -104,7 +103,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {

if markup.Type(readmeFile.Name()) != "" {
ctx.Data["IsMarkup"] = true
ctx.Data["FileContent"] = string(markup.Render(readmeFile.Name(), buf, treeLink, ctx.Repo.Repository.ComposeMetas()))
ctx.Data["FileContent"] = string(markup.Render(readmeFile.Name(), buf, ctx.Repo.RepoLink, ctx.Repo.Repository.ComposeMetas()))
} else {
ctx.Data["IsRenderedHTML"] = true
ctx.Data["FileContent"] = strings.Replace(
Expand Down Expand Up @@ -143,7 +142,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
}
}

func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink string) {
func renderFile(ctx *context.Context, entry *git.TreeEntry, rawLink string) {
ctx.Data["IsViewFile"] = true

blob := entry.Blob()
Expand Down Expand Up @@ -211,7 +210,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
ctx.Data["ReadmeExist"] = readmeExist
if markup.Type(blob.Name()) != "" {
ctx.Data["IsMarkup"] = true
ctx.Data["FileContent"] = string(markup.Render(blob.Name(), buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas()))
ctx.Data["FileContent"] = string(markup.Render(blob.Name(), buf, ctx.Repo.RepoLink, ctx.Repo.Repository.ComposeMetas()))
} else if readmeExist {
ctx.Data["IsRenderedHTML"] = true
ctx.Data["FileContent"] = strings.Replace(
Expand Down Expand Up @@ -344,9 +343,9 @@ func renderCode(ctx *context.Context) {
}

if entry.IsDir() {
renderDirectory(ctx, treeLink)
renderDirectory(ctx)
} else {
renderFile(ctx, entry, treeLink, rawLink)
renderFile(ctx, entry, rawLink)
}
if ctx.Written() {
return
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/editor/edit.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff">
<a class="active item" data-tab="write"><i class="octicon octicon-code"></i> {{if .IsNewFile}}{{.i18n.Tr "repo.editor.new_file"}}{{else}}{{.i18n.Tr "repo.editor.edit_file"}}{{end}}</a>
{{if not .IsNewFile}}
<a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL | EscapePound}}" data-preview-file-modes="{{.PreviewableFileModes}}"><i class="octicon octicon-eye"></i> {{.i18n.Tr "repo.release.preview"}}</a>
<a class="item" data-tab="preview" data-url="{{AppSubUrl}}/api/v1/markdown" data-context="{{.RepoLink}}" data-preview-file-modes="{{.PreviewableFileModes}}"><i class="octicon octicon-eye"></i> {{.i18n.Tr "repo.release.preview"}}</a>
<a class="item" data-tab="diff" data-url="{{.RepoLink}}/_preview/{{.BranchName | EscapePound}}/{{.TreePath | EscapePound}}" data-context="{{.BranchLink}}"><i class="octicon octicon-diff"></i> {{.i18n.Tr "repo.editor.preview_changes"}}</a>
{{end}}
</div>
Expand Down