Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-12-22 16:20:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unify error handling in routing layer

Browse Source
This commit is contained in:
ᴜɴᴋɴᴡᴏɴ
2020-03-16 01:22:27 +08:00
parent 82ff0c5852
commit 9e9ca66467
95 changed files with 1438 additions and 1417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/route/home.go
View File

@@ -6,11 +6,11 @@ package route
import (
"github.com/unknwon/paginater"
user2 "gogs.io/gogs/internal/route/user"
"gogs.io/gogs/internal/conf"
"gogs.io/gogs/internal/context"
"gogs.io/gogs/internal/db"
"gogs.io/gogs/internal/route/user"
)
const (
@@ -24,9 +24,9 @@ func Home(c *context.Context) {
if c.IsLogged {
if !c.User.IsActive && conf.Auth.RequireEmailConfirmation {
c.Data["Title"] = c.Tr("auth.active_your_account")
c.Success(user2.ACTIVATE)
c.Success(user.ACTIVATE)
} else {
user2.Dashboard(c)
user.Dashboard(c)
}
return
}
@@ -61,7 +61,7 @@ func ExploreRepos(c *context.Context) {
PageSize: conf.UI.ExplorePagingNum,
})
if err != nil {
c.ServerError("SearchRepositoryByName", err)
c.Error(err, "search repository by name")
return
}
c.Data["Keyword"] = keyword
@@ -69,7 +69,7 @@ func ExploreRepos(c *context.Context) {
c.Data["Page"] = paginater.New(int(count), conf.UI.ExplorePagingNum, page, 5)
if err = db.RepositoryList(repos).LoadAttributes(); err != nil {
c.ServerError("RepositoryList.LoadAttributes", err)
c.Error(err, "load attributes")
return
}
c.Data["Repos"] = repos
@@ -102,7 +102,7 @@ func RenderUserSearch(c *context.Context, opts *UserSearchOptions) {
if len(keyword) == 0 {
users, err = opts.Ranger(page, opts.PageSize)
if err != nil {
c.ServerError("Ranger", err)
c.Error(err, "ranger")
return
}
count = opts.Counter()
@@ -115,7 +115,7 @@ func RenderUserSearch(c *context.Context, opts *UserSearchOptions) {
PageSize: opts.PageSize,
})
if err != nil {
c.ServerError("SearchUserByName", err)
c.Error(err, "search user by name")
return
}
}