diff options
author | Unknwon <u@gogs.io> | 2015-08-05 20:26:00 +0800 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2015-08-05 20:26:00 +0800 |
commit | 2c507667bfd17f88dc4bfabc426c74cd5f8e4461 (patch) | |
tree | 31b267331f84d45a92f6a0bfe7eaafa124f4578f /modules/middleware/repo.go | |
parent | 0705f55ce097b9892a7c4c11faa5396c4e557232 (diff) | |
parent | b9527cd1bfabcce3be62b43f0c199b1418519549 (diff) |
Merge branch 'develop' of github.com:gogits/gogs into feature/milestone
# Conflicts:
# gogs.go
# models/issue.go
# templates/.VERSION
Diffstat (limited to 'modules/middleware/repo.go')
-rw-r--r-- | modules/middleware/repo.go | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index de0d7829..12164632 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -10,6 +10,8 @@ import ( "strings" "github.com/Unknwon/macaron" + "github.com/mcuadros/go-version" + "github.com/mssola/user_agent" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" @@ -18,6 +20,11 @@ import ( "github.com/gogits/gogs/modules/setting" ) +const ( + FIREFOX_COPY_SUPPORT = "41.0" + CHROME_COPY_SUPPORT = "43.0.2356" +) + func ApiRepoAssignment() macaron.Handler { return func(ctx *Context) { userName := ctx.Params(":username") @@ -34,7 +41,7 @@ func ApiRepoAssignment() macaron.Handler { } else { u, err = models.GetUserByName(userName) if err != nil { - if err == models.ErrUserNotExist { + if models.IsErrUserNotExist(err) { ctx.Error(404) } else { ctx.JSON(500, &base.ApiJsonErr{"GetUserByName: " + err.Error(), base.DOC_URL}) @@ -210,7 +217,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { } else { u, err = models.GetUserByName(userName) if err != nil { - if err == models.ErrUserNotExist { + if models.IsErrUserNotExist(err) { ctx.Handle(404, "GetUserByName", err) } else { ctx.Handle(500, "GetUserByName", err) @@ -345,6 +352,13 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { ctx.Data["BranchName"] = ctx.Repo.BranchName ctx.Data["CommitId"] = ctx.Repo.CommitId + + userAgent := ctx.Req.Header.Get("User-Agent") + ua := user_agent.New(userAgent) + browserName, browserVer := ua.Browser() + + ctx.Data["BrowserSupportsCopy"] = (browserName == "Chrome" && version.Compare(browserVer, CHROME_COPY_SUPPORT, ">=")) || + (browserName == "Firefox" && version.Compare(browserVer, FIREFOX_COPY_SUPPORT, ">=")) } } |