Browse Source

Merge remote-tracking branch 'origin/master'

FuXiaoHei 11 years ago
parent
commit
df1985e1e8
2 changed files with 15 additions and 1 deletions
  1. 2 1
      modules/middleware/repo.go
  2. 13 0
      routers/repo/single.go

+ 2 - 1
modules/middleware/repo.go

@@ -6,6 +6,7 @@ package middleware
 
 import (
 	"errors"
+	"strings"
 
 	"github.com/codegangsta/martini"
 
@@ -23,7 +24,7 @@ func RepoAssignment(redirect bool) martini.Handler {
 		)
 
 		// get repository owner
-		ctx.Repo.IsOwner = ctx.IsSigned && ctx.User.LowerName == params["username"]
+		ctx.Repo.IsOwner = ctx.IsSigned && ctx.User.LowerName == strings.ToLower(params["username"])
 
 		if !ctx.Repo.IsOwner {
 			user, err = models.GetUserByName(params["username"])

+ 13 - 0
routers/repo/single.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/codegangsta/martini"
+	// "github.com/slene/blackfriday"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/middleware"
@@ -42,6 +43,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
 		params["branchname"] = "master"
 	}
 
+	// Directory and file list.
 	treename := params["_1"]
 	files, err := models.GetReposFiles(params["username"], params["reponame"],
 		params["branchname"], treename)
@@ -53,6 +55,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
 	ctx.Data["Reponame"] = params["reponame"]
 	ctx.Data["Branchname"] = params["branchname"]
 
+	// Branches.
 	brs, err := models.GetBranches(params["username"], params["reponame"])
 	if err != nil {
 		ctx.Handle(200, "repo.Single", err)
@@ -70,6 +73,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
 		}
 	}
 
+	// Latest commit.
 	commit, err := models.GetLastestCommit(params["username"], params["reponame"])
 	if err != nil {
 		ctx.Handle(200, "repo.Single", err)
@@ -77,6 +81,15 @@ func Single(ctx *middleware.Context, params martini.Params) {
 	}
 	ctx.Data["LatestCommit"] = commit
 
+	// README.
+	// for _, f := range files {
+	// 	if f.Name == "README.md" {
+	// ctx.Data["ReadmeName"] = "README.md"
+	// ctx.Data["ReadmeContent"] =
+	// 		break
+	// 	}
+	// }
+
 	ctx.Data["Paths"] = Paths
 	ctx.Data["Treenames"] = treenames
 	ctx.Data["IsRepoToolbarSource"] = true