From b27c34f39acee3bf7b6594a1f0db2183b343326c Mon Sep 17 00:00:00 2001
From: slene <vslene@gmail.com>
Date: Sun, 30 Mar 2014 10:13:02 +0800
Subject: update git api. fix link... and so on

---
 routers/repo/commit.go | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'routers/repo/commit.go')

diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index afc1ffda..449f6443 100644
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -50,16 +50,12 @@ func Commits(ctx *middleware.Context, params martini.Params) {
 }
 
 func Diff(ctx *middleware.Context, params martini.Params) {
-	userName := params["username"]
-	repoName := params["reponame"]
-	branchName := params["branchname"]
-	commitId := params["commitid"]
+	userName := ctx.Repo.Owner.Name
+	repoName := ctx.Repo.Repository.Name
+	branchName := ctx.Repo.BranchName
+	commitId := ctx.Repo.CommitId
 
-	commit, err := models.GetCommit(userName, repoName, branchName, commitId)
-	if err != nil {
-		ctx.Handle(404, "repo.Diff", err)
-		return
-	}
+	commit := ctx.Repo.Commit
 
 	diff, err := models.GetDiff(models.RepoPath(userName, repoName), commitId)
 	if err != nil {
@@ -85,11 +81,9 @@ func Diff(ctx *middleware.Context, params martini.Params) {
 		return isImage
 	}
 
-	shortSha := params["commitid"][:10]
 	ctx.Data["IsImageFile"] = isImageFile
-	ctx.Data["Title"] = commit.Message() + " · " + shortSha
+	ctx.Data["Title"] = commit.Message() + " · " + base.ShortSha(commitId)
 	ctx.Data["Commit"] = commit
-	ctx.Data["ShortSha"] = shortSha
 	ctx.Data["Diff"] = diff
 	ctx.Data["IsRepoToolbarCommits"] = true
 	ctx.Data["SourcePath"] = "/" + path.Join(userName, repoName, "src", commitId)
-- 
cgit v1.2.3