aboutsummaryrefslogtreecommitdiffstats
path: root/routers/repo
diff options
context:
space:
mode:
Diffstat (limited to 'routers/repo')
-rw-r--r--routers/repo/issue.go3
-rw-r--r--routers/repo/repo.go4
2 files changed, 6 insertions, 1 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index ba0669a0ad..77e35bbae6 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -6,6 +6,7 @@ package repo
import (
"fmt"
+ "net/url"
"github.com/codegangsta/martini"
@@ -35,7 +36,9 @@ func Issues(ctx *middleware.Context) {
var posterId int64 = 0
if ctx.Query("type") == "created_by" {
if !ctx.IsSigned {
+ ctx.SetCookie("redirect_to", "/"+url.QueryEscape(ctx.Req.RequestURI))
ctx.Redirect("/user/login/", 302)
+ return
}
posterId = ctx.User.Id
ctx.Data["ViewType"] = "created_by"
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 3b57cb39f6..e7107ad1cd 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -85,9 +85,11 @@ func Single(ctx *middleware.Context, params martini.Params) {
ctx.Data["Branches"] = brs
var commitId string
- if !models.IsBranchExist(userName, repoName, branchName) {
+ isViewBranch := models.IsBranchExist(userName, repoName, branchName)
+ if !isViewBranch {
commitId = branchName
}
+ ctx.Data["IsViewBranch"] = isViewBranch
repoFile, err := models.GetTargetFile(userName, repoName,
branchName, commitId, treename)