Unknwon 7 years ago
parent
commit
0d4498429c
4 changed files with 13 additions and 8 deletions
  1. 1 1
      README.md
  2. 1 1
      gogs.go
  3. 10 5
      routers/repo/view.go
  4. 1 1
      templates/.VERSION

+ 1 - 1
README.md

@@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](public/img/gogs-large-resize.png)
 
-##### Current version: 0.7.1 Beta
+##### Current version: 0.7.2 Beta
 
 <table>
     <tr>

+ 1 - 1
gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.7.1.1108 Beta"
+const APP_VER = "0.7.2.1109 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

+ 10 - 5
routers/repo/view.go

@@ -31,14 +31,19 @@ func Home(ctx *middleware.Context) {
 
 	repoLink := ctx.Repo.RepoLink
 	branchLink := ctx.Repo.RepoLink + "/src/" + branchName
+	treeLink := branchLink
 	rawLink := ctx.Repo.RepoLink + "/raw/" + branchName
 
 	// Get tree path
 	treename := ctx.Repo.TreeName
 
-	if len(treename) > 0 && treename[len(treename)-1] == '/' {
-		ctx.Redirect(repoLink + "/src/" + branchName + "/" + treename[:len(treename)-1])
-		return
+	if len(treename) > 0 {
+		if treename[len(treename)-1] == '/' {
+			ctx.Redirect(repoLink + "/src/" + branchName + "/" + treename[:len(treename)-1])
+			return
+		}
+
+		treeLink += "/" + treename
 	}
 
 	ctx.Data["IsRepoToolbarSource"] = true
@@ -98,7 +103,7 @@ func Home(ctx *middleware.Context) {
 				readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name())
 				ctx.Data["ReadmeExist"] = readmeExist
 				if readmeExist {
-					ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, branchLink))
+					ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, path.Dir(treeLink)))
 				} else {
 					if err, content := base.ToUtf8WithErr(buf); err != nil {
 						if err != nil {
@@ -191,7 +196,7 @@ func Home(ctx *middleware.Context) {
 					buf = append(buf, d...)
 					switch {
 					case base.IsMarkdownFile(readmeFile.Name()):
-						buf = base.RenderMarkdown(buf, branchLink)
+						buf = base.RenderMarkdown(buf, treeLink)
 					default:
 						buf = bytes.Replace(buf, []byte("\n"), []byte(`<br>`), -1)
 					}

+ 1 - 1
templates/.VERSION

@@ -1 +1 @@
-0.7.1.1108 Beta
+0.7.2.1109 Beta