Skip to content

Commit 5399b03

Browse files
committed
Revert some changes
1 parent 7d44043 commit 5399b03

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

routers/web/repo/find.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ package repo
55

66
import (
77
"net/http"
8-
"net/url"
98

10-
"code.gitea.io/gitea/modules/git"
119
"code.gitea.io/gitea/modules/templates"
1210
"code.gitea.io/gitea/modules/util"
1311
"code.gitea.io/gitea/services/context"
@@ -20,8 +18,7 @@ const (
2018
// FindFiles render the page to find repository files
2119
func FindFiles(ctx *context.Context) {
2220
path := ctx.PathParam("*")
23-
ref := git.RefNameFromUserInput(ctx.FormTrim("ref"), git.RefTypeBranch, git.RefTypeTag, git.RefTypeCommit)
24-
ctx.Data["TreeLink"] = ctx.Repo.RepoLink + "/src/" + ref.RefWebLinkPath() + "/" + util.PathEscapeSegments(path)
25-
ctx.Data["DataLink"] = ctx.Repo.RepoLink + "/tree-list/" + util.PathEscapeSegments(path) + "?ref=" + url.QueryEscape(ctx.FormTrim("ref"))
21+
ctx.Data["TreeLink"] = ctx.Repo.RepoLink + "/src/" + util.PathEscapeSegments(path)
22+
ctx.Data["DataLink"] = ctx.Repo.RepoLink + "/tree-list/" + util.PathEscapeSegments(path)
2623
ctx.HTML(http.StatusOK, tplFindFiles)
2724
}

routers/web/repo/treelist.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ import (
1515

1616
// TreeList get all files' entries of a repository
1717
func TreeList(ctx *context.Context) {
18-
_, commit, err := ctx.Repo.GetRefCommit(ctx.FormString("ref"), git.RefTypeBranch, git.RefTypeTag, git.RefTypeCommit)
19-
if err != nil {
20-
ctx.ServerError("GetRefCommit", err)
21-
return
22-
}
23-
tree, err := commit.SubTree("/")
18+
tree, err := ctx.Repo.Commit.SubTree("/")
2419
if err != nil {
2520
ctx.ServerError("Repo.Commit.SubTree", err)
2621
return

routers/web/web.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -1157,8 +1157,11 @@ func registerRoutes(m *web.Router) {
11571157

11581158
m.Group("/{username}/{reponame}", func() {
11591159
m.Get("/find/*", repo.FindFiles)
1160-
m.Get("/find", repo.FindFiles)
1161-
m.Get("/tree-list", repo.TreeList)
1160+
m.Group("/tree-list", func() {
1161+
m.Get("/branch/*", context.RepoRefByType(git.RefTypeBranch), repo.TreeList)
1162+
m.Get("/tag/*", context.RepoRefByType(git.RefTypeTag), repo.TreeList)
1163+
m.Get("/commit/*", context.RepoRefByType(git.RefTypeCommit), repo.TreeList)
1164+
})
11621165
m.Get("/compare", repo.MustBeNotEmpty, repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.CompareDiff)
11631166
m.Combo("/compare/*", repo.MustBeNotEmpty, repo.SetEditorconfigIfExists).
11641167
Get(repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.CompareDiff).

templates/repo/home.tmpl

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@
6262

6363
<!-- Show go to file if on home page -->
6464
{{if $isTreePathRoot}}
65-
{{/* FIXME: it should still use RefTypeNameSubURL, otherwise the link is ugly */}}
66-
<a href="{{.Repository.Link}}/find/{{.TreePath}}?ref={{.RefFullName}}" class="ui compact basic button">{{ctx.Locale.Tr "repo.find_file.go_to_file"}}</a>
65+
<a href="{{.Repository.Link}}/find/{{.RefTypeNameSubURL}}" class="ui compact basic button">{{ctx.Locale.Tr "repo.find_file.go_to_file"}}</a>
6766
{{end}}
6867

6968
{{if and .CanWriteCode .IsViewBranch (not .Repository.IsMirror) (not .Repository.IsArchived) (not .IsViewFile)}}

0 commit comments

Comments
 (0)