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 /routers/org | |
| 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 'routers/org')
| -rw-r--r-- | routers/org/members.go | 2 | ||||
| -rw-r--r-- | routers/org/teams.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/routers/org/members.go b/routers/org/members.go index c8c90cfe..dd742bb7 100644 --- a/routers/org/members.go +++ b/routers/org/members.go @@ -100,7 +100,7 @@ func Invitation(ctx *middleware.Context) { uname := ctx.Query("uname") u, err := models.GetUserByName(uname) if err != nil { - if err == models.ErrUserNotExist { + if models.IsErrUserNotExist(err) { ctx.Flash.Error(ctx.Tr("form.user_not_exist")) ctx.Redirect(ctx.Org.OrgLink + "/invitations/new") } else { diff --git a/routers/org/teams.go b/routers/org/teams.go index 7436e30e..6968512f 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -77,7 +77,7 @@ func TeamsAction(ctx *middleware.Context) { var u *models.User u, err = models.GetUserByName(uname) if err != nil { - if err == models.ErrUserNotExist { + if models.IsErrUserNotExist(err) { ctx.Flash.Error(ctx.Tr("form.user_not_exist")) ctx.Redirect(ctx.Org.OrgLink + "/teams/" + ctx.Org.Team.LowerName) } else { |