aboutsummaryrefslogtreecommitdiff
path: root/routers
diff options
context:
space:
mode:
Diffstat (limited to 'routers')
-rw-r--r--routers/api/v1/api.go7
-rw-r--r--routers/api/v1/repo/collaborators.go9
-rw-r--r--routers/api/v1/repo/issue.go5
-rw-r--r--routers/api/v1/repo/repo.go9
-rw-r--r--routers/api/v1/user/key.go3
-rw-r--r--routers/api/v1/user/user.go3
-rw-r--r--routers/org/members.go3
-rw-r--r--routers/org/setting.go3
-rw-r--r--routers/org/teams.go3
-rw-r--r--routers/repo/http.go5
-rw-r--r--routers/repo/pull.go15
-rw-r--r--routers/repo/repo.go3
-rw-r--r--routers/repo/setting.go3
-rw-r--r--routers/repo/webhook.go6
-rw-r--r--routers/user/auth.go13
-rw-r--r--routers/user/home.go15
-rw-r--r--routers/user/profile.go7
-rw-r--r--routers/user/setting.go4
18 files changed, 54 insertions, 62 deletions
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 35234fa8..49c1ee59 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -13,6 +13,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
"github.com/gogits/gogs/routers/api/v1/admin"
@@ -38,7 +39,7 @@ func repoAssignment() macaron.Handler {
} else {
owner, err = models.GetUserByName(userName)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Status(404)
} else {
ctx.Error(500, "GetUserByName", err)
@@ -137,7 +138,7 @@ func orgAssignment(args ...bool) macaron.Handler {
if assignOrg {
ctx.Org.Organization, err = models.GetUserByName(ctx.Params(":orgname"))
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Status(404)
} else {
ctx.Error(500, "GetUserByName", err)
@@ -149,7 +150,7 @@ func orgAssignment(args ...bool) macaron.Handler {
if assignTeam {
ctx.Org.Team, err = models.GetTeamByID(ctx.ParamsInt64(":teamid"))
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Status(404)
} else {
ctx.Error(500, "GetTeamById", err)
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index e1a3b423..f240661f 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -8,13 +8,14 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/context"
)
func ListCollaborators(ctx *context.APIContext) {
collaborators, err := ctx.Repo.Repository.GetCollaborators()
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Error(422, "", err)
} else {
ctx.Error(500, "GetCollaborators", err)
@@ -32,7 +33,7 @@ func ListCollaborators(ctx *context.APIContext) {
func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) {
collaborator, err := models.GetUserByName(ctx.Params(":collaborator"))
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Error(422, "", err)
} else {
ctx.Error(500, "GetUserByName", err)
@@ -58,7 +59,7 @@ func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) {
func IsCollaborator(ctx *context.APIContext) {
collaborator, err := models.GetUserByName(ctx.Params(":collaborator"))
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Error(422, "", err)
} else {
ctx.Error(500, "GetUserByName", err)
@@ -82,7 +83,7 @@ func IsCollaborator(ctx *context.APIContext) {
func DeleteCollaborator(ctx *context.APIContext) {
collaborator, err := models.GetUserByName(ctx.Params(":collaborator"))
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Error(422, "", err)
} else {
ctx.Error(500, "GetUserByName", err)
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index fe3b01cb..97b058a9 100644
--- a/routers/api/v1/repo/issue.go
+++ b/routers/api/v1/repo/issue.go
@@ -11,6 +11,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
)
@@ -86,7 +87,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
if len(form.Assignee) > 0 {
assignee, err := models.GetUserByName(form.Assignee)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", form.Assignee))
} else {
ctx.Error(500, "GetUserByName", err)
@@ -152,7 +153,7 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
} else {
assignee, err := models.GetUserByName(*form.Assignee)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Error(422, "", fmt.Sprintf("assignee does not exist: [name: %s]", *form.Assignee))
} else {
ctx.Error(500, "GetUserByName", err)
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index a6dd284a..a491e7ce 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -12,6 +12,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
"github.com/gogits/gogs/modules/setting"
@@ -80,7 +81,7 @@ func Search(ctx *context.APIContext) {
func listUserRepositories(ctx *context.APIContext, username string) {
user, err := models.GetUserByName(username)
if err != nil {
- ctx.NotFoundOrServerError("GetUserByName", models.IsErrUserNotExist, err)
+ ctx.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
return
}
@@ -190,7 +191,7 @@ func Create(ctx *context.APIContext, opt api.CreateRepoOption) {
func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) {
org, err := models.GetOrgByName(ctx.Params(":org"))
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Error(422, "", err)
} else {
ctx.Error(500, "GetOrgByName", err)
@@ -213,7 +214,7 @@ func Migrate(ctx *context.APIContext, f form.MigrateRepo) {
if f.Uid != ctxUser.ID {
org, err := models.GetUserByID(f.Uid)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Error(422, "", err)
} else {
ctx.Error(500, "GetUserByID", err)
@@ -280,7 +281,7 @@ func Migrate(ctx *context.APIContext, f form.MigrateRepo) {
func parseOwnerAndRepo(ctx *context.APIContext) (*models.User, *models.Repository) {
owner, err := models.GetUserByName(ctx.Params(":username"))
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Error(422, "", err)
} else {
ctx.Error(500, "GetUserByName", err)
diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go
index 3e407fef..941cfb60 100644
--- a/routers/api/v1/user/key.go
+++ b/routers/api/v1/user/key.go
@@ -8,6 +8,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
@@ -17,7 +18,7 @@ import (
func GetUserByParamsName(ctx *context.APIContext, name string) *models.User {
user, err := models.GetUserByName(ctx.Params(name))
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Status(404)
} else {
ctx.Error(500, "GetUserByName", err)
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index b526af5d..b1f06ec7 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -10,6 +10,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/context"
)
@@ -54,7 +55,7 @@ func Search(ctx *context.APIContext) {
func GetInfo(ctx *context.APIContext) {
u, err := models.GetUserByName(ctx.Params(":username"))
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Status(404)
} else {
ctx.Error(500, "GetUserByName", err)
diff --git a/routers/org/members.go b/routers/org/members.go
index 6eade743..2f059c8c 100644
--- a/routers/org/members.go
+++ b/routers/org/members.go
@@ -9,6 +9,7 @@ import (
log "gopkg.in/clog.v1"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
@@ -100,7 +101,7 @@ func Invitation(ctx *context.Context) {
uname := ctx.Query("uname")
u, err := models.GetUserByName(uname)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Flash.Error(ctx.Tr("form.user_not_exist"))
ctx.Redirect(ctx.Org.OrgLink + "/invitations/new")
} else {
diff --git a/routers/org/setting.go b/routers/org/setting.go
index ae16854a..5a07e2cb 100644
--- a/routers/org/setting.go
+++ b/routers/org/setting.go
@@ -10,6 +10,7 @@ import (
log "gopkg.in/clog.v1"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
@@ -113,7 +114,7 @@ func SettingsDelete(ctx *context.Context) {
org := ctx.Org.Organization
if ctx.Req.Method == "POST" {
if _, err := models.UserSignIn(ctx.User.Name, ctx.Query("password")); err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_password"), SETTINGS_DELETE, nil)
} else {
ctx.Handle(500, "UserSignIn", err)
diff --git a/routers/org/teams.go b/routers/org/teams.go
index 221b636f..503739de 100644
--- a/routers/org/teams.go
+++ b/routers/org/teams.go
@@ -11,6 +11,7 @@ import (
log "gopkg.in/clog.v1"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
@@ -73,7 +74,7 @@ func TeamsAction(ctx *context.Context) {
var u *models.User
u, err = models.GetUserByName(uname)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Flash.Error(ctx.Tr("form.user_not_exist"))
ctx.Redirect(ctx.Org.OrgLink + "/teams/" + ctx.Org.Team.LowerName)
} else {
diff --git a/routers/repo/http.go b/routers/repo/http.go
index b35d5a9c..b385a13a 100644
--- a/routers/repo/http.go
+++ b/routers/repo/http.go
@@ -22,6 +22,7 @@ import (
"gopkg.in/macaron.v1"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
@@ -59,7 +60,7 @@ func HTTPContexter() macaron.Handler {
owner, err := models.GetUserByName(ownerName)
if err != nil {
- ctx.NotFoundOrServerError("GetUserByName", models.IsErrUserNotExist, err)
+ ctx.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
return
}
@@ -107,7 +108,7 @@ func HTTPContexter() macaron.Handler {
}
authUser, err := models.UserSignIn(authUsername, authPassword)
- if err != nil && !models.IsErrUserNotExist(err) {
+ if err != nil && !errors.IsUserNotExist(err) {
ctx.Handle(http.StatusInternalServerError, "UserSignIn", err)
return
}
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index c4c5187c..9184c5e8 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -15,6 +15,7 @@ import (
"github.com/gogits/git-module"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
@@ -449,11 +450,7 @@ func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, *
} else if len(headInfos) == 2 {
headUser, err = models.GetUserByName(headInfos[0])
if err != nil {
- if models.IsErrUserNotExist(err) {
- ctx.Handle(404, "GetUserByName", nil)
- } else {
- ctx.Handle(500, "GetUserByName", err)
- }
+ ctx.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
return nil, nil, nil, nil, "", ""
}
headBranch = headInfos[1]
@@ -719,7 +716,7 @@ func CompareAndPullRequestPost(ctx *context.Context, f form.NewIssue) {
func parseOwnerAndRepo(ctx *context.Context) (*models.User, *models.Repository) {
owner, err := models.GetUserByName(ctx.Params(":username"))
if err != nil {
- ctx.NotFoundOrServerError("GetUserByName", models.IsErrUserNotExist, err)
+ ctx.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
return nil, nil
}
@@ -753,11 +750,7 @@ func TriggerTask(ctx *context.Context) {
pusher, err := models.GetUserByID(pusherID)
if err != nil {
- if models.IsErrUserNotExist(err) {
- ctx.Error(404)
- } else {
- ctx.Handle(500, "GetUserByID", err)
- }
+ ctx.NotFoundOrServerError("GetUserByID", errors.IsUserNotExist, err)
return
}
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 8a32f214..4604d643 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -16,6 +16,7 @@ import (
"github.com/gogits/git-module"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
@@ -47,7 +48,7 @@ func checkContextUser(ctx *context.Context, uid int64) *models.User {
}
org, err := models.GetUserByID(uid)
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
return ctx.User
}
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 6ccd058a..c52be187 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -14,6 +14,7 @@ import (
"github.com/gogits/git-module"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
@@ -311,7 +312,7 @@ func SettingsCollaborationPost(ctx *context.Context) {
u, err := models.GetUserByName(name)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Flash.Error(ctx.Tr("form.user_not_exist"))
ctx.Redirect(setting.AppSubUrl + ctx.Req.URL.Path)
} else {
diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
index 506acec7..73bd8786 100644
--- a/routers/repo/webhook.go
+++ b/routers/repo/webhook.go
@@ -6,7 +6,6 @@ package repo
import (
"encoding/json"
- "errors"
"fmt"
"strings"
@@ -16,6 +15,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
@@ -468,7 +468,7 @@ func TestWebhook(ctx *context.Context) {
author, err := models.GetUserByEmail(commit.Author.Email)
if err == nil {
authorUsername = author.Name
- } else if !models.IsErrUserNotExist(err) {
+ } else if !errors.IsUserNotExist(err) {
ctx.Flash.Error(fmt.Sprintf("GetUserByEmail.(author) [%s]: %v", commit.Author.Email, err))
ctx.Status(500)
return
@@ -477,7 +477,7 @@ func TestWebhook(ctx *context.Context) {
committer, err := models.GetUserByEmail(commit.Committer.Email)
if err == nil {
committerUsername = committer.Name
- } else if !models.IsErrUserNotExist(err) {
+ } else if !errors.IsUserNotExist(err) {
ctx.Flash.Error(fmt.Sprintf("GetUserByEmail.(committer) [%s]: %v", commit.Committer.Email, err))
ctx.Status(500)
return
diff --git a/routers/user/auth.go b/routers/user/auth.go
index 36aaa192..014a3317 100644
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -12,6 +12,7 @@ import (
log "gopkg.in/clog.v1"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
@@ -49,7 +50,7 @@ func AutoSignIn(ctx *context.Context) (bool, error) {
u, err := models.GetUserByName(uname)
if err != nil {
- if !models.IsErrUserNotExist(err) {
+ if !errors.IsUserNotExist(err) {
return false, fmt.Errorf("GetUserByName: %v", err)
}
return false, nil
@@ -113,7 +114,7 @@ func SignInPost(ctx *context.Context, f form.SignIn) {
u, err := models.UserSignIn(f.UserName, f.Password)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), SIGNIN, &f)
} else {
ctx.Handle(500, "UserSignIn", err)
@@ -286,11 +287,7 @@ func Activate(ctx *context.Context) {
return
}
if err := models.UpdateUser(user); err != nil {
- if models.IsErrUserNotExist(err) {
- ctx.Error(404)
- } else {
- ctx.Handle(500, "UpdateUser", err)
- }
+ ctx.Handle(500, "UpdateUser", err)
return
}
@@ -351,7 +348,7 @@ func ForgotPasswdPost(ctx *context.Context) {
u, err := models.GetUserByEmail(email)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
ctx.Data["IsResetSent"] = true
ctx.HTML(200, FORGOT_PASSWORD)
diff --git a/routers/user/home.go b/routers/user/home.go
index cb85bd8f..39123da2 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -12,6 +12,7 @@ import (
"github.com/Unknwon/paginater"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
@@ -32,11 +33,7 @@ func getDashboardContextUser(ctx *context.Context) *models.User {
// Organization.
org, err := models.GetUserByName(orgName)
if err != nil {
- if models.IsErrUserNotExist(err) {
- ctx.Handle(404, "GetUserByName", err)
- } else {
- ctx.Handle(500, "GetUserByName", err)
- }
+ ctx.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
return nil
}
ctxUser = org
@@ -71,7 +68,7 @@ func retrieveFeeds(ctx *context.Context, ctxUser *models.User, userID, offset in
if !ok {
u, err := models.GetUserByName(act.ActUserName)
if err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
continue
}
ctx.Handle(500, "GetUserByName", err)
@@ -406,11 +403,7 @@ func showOrgProfile(ctx *context.Context) {
func Email2User(ctx *context.Context) {
u, err := models.GetUserByEmail(ctx.Query("email"))
if err != nil {
- if models.IsErrUserNotExist(err) {
- ctx.Handle(404, "GetUserByEmail", err)
- } else {
- ctx.Handle(500, "GetUserByEmail", err)
- }
+ ctx.NotFoundOrServerError("GetUserByEmail", errors.IsUserNotExist, err)
return
}
ctx.Redirect(setting.AppSubUrl + "/user/" + u.Name)
diff --git a/routers/user/profile.go b/routers/user/profile.go
index 414425b2..be435619 100644
--- a/routers/user/profile.go
+++ b/routers/user/profile.go
@@ -12,6 +12,7 @@ import (
"github.com/Unknwon/paginater"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
@@ -26,11 +27,7 @@ const (
func GetUserByName(ctx *context.Context, name string) *models.User {
user, err := models.GetUserByName(name)
if err != nil {
- if models.IsErrUserNotExist(err) {
- ctx.Handle(404, "GetUserByName", nil)
- } else {
- ctx.Handle(500, "GetUserByName", err)
- }
+ ctx.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err)
return nil
}
return user
diff --git a/routers/user/setting.go b/routers/user/setting.go
index 0ea00770..c2c273c2 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -5,7 +5,6 @@
package user
import (
- "errors"
"fmt"
"io/ioutil"
"strings"
@@ -14,6 +13,7 @@ import (
log "gopkg.in/clog.v1"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/models/errors"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/form"
@@ -456,7 +456,7 @@ func SettingsDelete(ctx *context.Context) {
if ctx.Req.Method == "POST" {
if _, err := models.UserSignIn(ctx.User.Name, ctx.Query("password")); err != nil {
- if models.IsErrUserNotExist(err) {
+ if errors.IsUserNotExist(err) {
ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_password"), SETTINGS_DELETE, nil)
} else {
ctx.Handle(500, "UserSignIn", err)
Powered by cgit, Themed by Ted Yin.