]> source.dussan.org Git - gitea.git/commitdiff
projects / gitea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c07d90)
Fix go-get, src and raw urls to new scheme (#2978) (#2986)
authorLauris BH <lauris@nix.lv>
Mon, 27 Nov 2017 02:02:08 +0000 (04:02 +0200)
committerLunny Xiao <xiaolunwen@gmail.com>
Mon, 27 Nov 2017 02:02:08 +0000 (10:02 +0800)
modules/context/context.go patch | blob | history
modules/context/repo.go patch | blob | history
routers/repo/commit.go patch | blob | history
routers/repo/pull.go patch | blob | history
routers/repo/search.go patch | blob | history

diff --git a/modules/context/context.go b/modules/context/context.go
index 9f5d934e4d629a12d692cf0a6a016c6f935f56e4..2c9afb36e70bb553c0695e06544c3a3ba6d3edab 100644 (file)
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -182,7 +182,7 @@ func Contexter() macaron.Handler {
                                        branchName = repo.DefaultBranch
                                }
                        }
-                       prefix := setting.AppURL + path.Join(ownerName, repoName, "src", branchName)
+                       prefix := setting.AppURL + path.Join(ownerName, repoName, "src", "branch", branchName)
                        c.PlainText(http.StatusOK, []byte(com.Expand(`
 <html>
        <head>
diff --git a/modules/context/repo.go b/modules/context/repo.go
index 883a826e4449da8c5d88b415345c4a166f8b2293..38baa4230615148c6dbd4508be1a783df0709d3c 100644 (file)
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -453,7 +453,7 @@ func RepoAssignment() macaron.Handler {
 
                if ctx.Query("go-get") == "1" {
                        ctx.Data["GoGetImport"] = ComposeGoGetImport(owner.Name, repo.Name)
-                       prefix := setting.AppURL + path.Join(owner.Name, repo.Name, "src", ctx.Repo.BranchName)
+                       prefix := setting.AppURL + path.Join(owner.Name, repo.Name, "src", "branch", ctx.Repo.BranchName)
                        ctx.Data["GoDocDirectory"] = prefix + "{/dir}"
                        ctx.Data["GoDocFile"] = prefix + "{/dir}/{file}#L{line}"
                }
diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index afd6b113c4190b871614423746bb11fe98395428..626d4728e2376320c71ad747e7a2f8b377f0205c 100644 (file)
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -250,11 +250,11 @@ func Diff(ctx *context.Context) {
        ctx.Data["Diff"] = diff
        ctx.Data["Parents"] = parents
        ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
-       ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", commitID)
+       ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", "commit", commitID)
        if commit.ParentCount() > 0 {
-               ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", parents[0])
+               ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", "commit", parents[0])
        }
-       ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "raw", commitID)
+       ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "raw", "commit", commitID)
        ctx.HTML(200, tplDiff)
 }
 
@@ -315,9 +315,9 @@ func CompareDiff(ctx *context.Context) {
        ctx.Data["Commit"] = commit
        ctx.Data["Diff"] = diff
        ctx.Data["DiffNotAvailable"] = diff.NumFiles() == 0
-       ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", afterCommitID)
-       ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", beforeCommitID)
-       ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "raw", afterCommitID)
+       ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", "commit", afterCommitID)
+       ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "src", "commit", beforeCommitID)
+       ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(userName, repoName, "raw", "commit", afterCommitID)
        ctx.Data["RequireHighlightJS"] = true
        ctx.HTML(200, tplDiff)
 }
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 14b09287341f0b5f0057f7924bb7a780b1d81a8e..284cb2d2d5236ea4854b54817946cabd5b30c4a4 100644 (file)
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -480,9 +480,9 @@ func ViewPullFiles(ctx *context.Context) {
        }
 
        ctx.Data["IsImageFile"] = commit.IsImageFile
-       ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", endCommitID)
-       ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", startCommitID)
-       ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", endCommitID)
+       ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", endCommitID)
+       ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", startCommitID)
+       ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", "commit", endCommitID)
        ctx.Data["RequireHighlightJS"] = true
 
        ctx.HTML(200, tplPullFiles)
@@ -689,9 +689,9 @@ func PrepareCompareDiff(
        ctx.Data["IsImageFile"] = headCommit.IsImageFile
 
        headTarget := path.Join(headUser.Name, repo.Name)
-       ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", headCommitID)
-       ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", prInfo.MergeBase)
-       ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", headCommitID)
+       ctx.Data["SourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", headCommitID)
+       ctx.Data["BeforeSourcePath"] = setting.AppSubURL + "/" + path.Join(headTarget, "src", "commit", prInfo.MergeBase)
+       ctx.Data["RawPath"] = setting.AppSubURL + "/" + path.Join(headTarget, "raw", "commit", headCommitID)
        return false
 }
 
diff --git a/routers/repo/search.go b/routers/repo/search.go
index d755080adb98ab717387600ae917dee2e64f1ad1..bf260ac8e43bae718bec69d10288fb018c765625 100644 (file)
--- a/routers/repo/search.go
+++ b/routers/repo/search.go
@@ -38,7 +38,7 @@ func Search(ctx *context.Context) {
        pager := paginater.New(total, setting.UI.RepoSearchPagingNum, page, 5)
        ctx.Data["Page"] = pager
        ctx.Data["SourcePath"] = setting.AppSubURL + "/" +
-               path.Join(ctx.Repo.Repository.Owner.Name, ctx.Repo.Repository.Name, "src", ctx.Repo.Repository.DefaultBranch)
+               path.Join(ctx.Repo.Repository.Owner.Name, ctx.Repo.Repository.Name, "src", "branch", ctx.Repo.Repository.DefaultBranch)
        ctx.Data["SearchResults"] = searchResults
        ctx.Data["RequireHighlightJS"] = true
        ctx.Data["PageIsViewCode"] = true
Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea