Merge branch 'master' of github.com:gogits/gogs

2 files changed, 66 insertions, 16 deletions

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 64440345..5769aff7 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -6,8 +6,6 @@ package repo
 
 import (
 	"net/http"
-
-	"github.com/codegangsta/martini"
 	"github.com/martini-contrib/render"
 	"github.com/martini-contrib/sessions"
 
@@ -87,20 +85,6 @@ func Delete(req *http.Request, r render.Render, data base.TmplData, session sess
 	}
 }
 
-func Repo(params martini.Params, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
-	data["Title"] = "Repository"
-	files, err := models.GetReposFiles(params["username"], params["reponame"], "HEAD", "/")
-	if err != nil {
-		data["ErrorMsg"] = err
-		log.Error("repo.List: %v", err)
-		r.HTML(200, "base/error", data)
-		return
-	}
-
-	data["Files"] = files
-	r.HTML(200, "repo/repo", data)
-}
-
 func List(req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
 	u := auth.SignedInUser(session)
 	if u != nil {
diff --git a/routers/repo/single.go b/routers/repo/single.go
new file mode 100644
index 00000000..811aed39
--- /dev/null
+++ b/routers/repo/single.go
@@ -0,0 +1,66 @@
+package repo
+
+import (
+	"net/http"
+
+	"github.com/codegangsta/martini"
+	"github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/modules/auth"
+	"github.com/gogits/gogs/modules/base"
+	"github.com/martini-contrib/render"
+	"github.com/martini-contrib/sessions"
+	"github.com/qiniu/log"
+)
+
+func Single(params martini.Params, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
+	var (
+		user *models.User
+		err  error
+	)
+	// get repository owner
+	isOwner := (data["SignedUserName"] == params["username"])
+	if !isOwner {
+		user, err = models.GetUserByName(params["username"])
+		if err != nil {
+			data["ErrorMsg"] = err
+			//log.Error("repo.Single: %v", err)
+			r.HTML(200, "base/error", data)
+			return
+		}
+	} else {
+		user = auth.SignedInUser(session)
+	}
+	if user == nil {
+		data["ErrorMsg"] = "invliad user account for single repository"
+		//log.Error("repo.Single: %v", err)
+		r.HTML(200, "base/error", data)
+		return
+	}
+	data["IsRepositoryOwner"] = isOwner
+
+	// get repository
+	repo, err := models.GetRepositoryByName(user, params["reponame"])
+	if err != nil {
+		data["ErrorMsg"] = err
+		//log.Error("repo.Single: %v", err)
+		r.HTML(200, "base/error", data)
+		return
+	}
+
+	data["Repository"] = repo
+	data["Owner"] = user
+	data["Title"] = user.Name + "/" + repo.Name
+	data["RepositoryLink"] = data["Title"]
+	data["IsRepoToolbarSource"] = true
+
+	files, err := models.GetReposFiles(params["username"], params["reponame"], "HEAD", "/")
+	if err != nil {
+		data["ErrorMsg"] = err
+		log.Error("repo.List: %v", err)
+		r.HTML(200, "base/error", data)
+		return
+	}
+
+	data["Files"] = files
+	r.HTML(200, "repo/single", data)
+}