USEFULL/gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-05-31 11:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

routes/home: minor code improve

Browse Source
This commit is contained in:
Unknwon 2017-07-18 22:09:57 -04:00
parent ee9950ec2f
commit 643c85e9c8
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/pkg/setting" "github.com/gogits/gogs/pkg/setting"
) )
const APP_VER = "0.11.27.0718" const APP_VER = "0.11.28.0718"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

2
models/repo.go
View File

@ -1634,7 +1634,7 @@ type SearchRepoOptions struct {
// SearchRepositoryByName takes keyword and part of repository name to search, // SearchRepositoryByName takes keyword and part of repository name to search,
// it returns results in given range and number of total results. // it returns results in given range and number of total results.
func SearchRepositoryByName(opts *SearchRepoOptions) (repos []*Repository, _ int64, _ error) { func SearchRepositoryByName(opts *SearchRepoOptions) (repos []*Repository, count int64, err error) {
if opts.Page <= 0 { if opts.Page <= 0 {
opts.Page = 1 opts.Page = 1
} }

16
routes/home.go
View File

@ -24,7 +24,7 @@ func Home(c *context.Context) {
if c.IsLogged { if c.IsLogged {
if !c.User.IsActive && setting.Service.RegisterEmailConfirm { if !c.User.IsActive && setting.Service.RegisterEmailConfirm {
c.Data["Title"] = c.Tr("auth.active_your_account") c.Data["Title"] = c.Tr("auth.active_your_account")
c.HTML(200, user.ACTIVATE) c.Success(user.ACTIVATE)
} else { } else {
user.Dashboard(c) user.Dashboard(c)
} }
@ -39,7 +39,7 @@ func Home(c *context.Context) {
} }
c.Data["PageIsHome"] = true c.Data["PageIsHome"] = true
c.HTML(200, HOME) c.Success(HOME)
} }
func ExploreRepos(c *context.Context) { func ExploreRepos(c *context.Context) {
@ -61,7 +61,7 @@ func ExploreRepos(c *context.Context) {
PageSize: setting.UI.ExplorePagingNum, PageSize: setting.UI.ExplorePagingNum,
}) })
if err != nil { if err != nil {
c.Handle(500, "SearchRepositoryByName", err) c.ServerError("SearchRepositoryByName", err)
return return
} }
c.Data["Keyword"] = keyword c.Data["Keyword"] = keyword
@ -69,12 +69,12 @@ func ExploreRepos(c *context.Context) {
c.Data["Page"] = paginater.New(int(count), setting.UI.ExplorePagingNum, page, 5) c.Data["Page"] = paginater.New(int(count), setting.UI.ExplorePagingNum, page, 5)
if err = models.RepositoryList(repos).LoadAttributes(); err != nil { if err = models.RepositoryList(repos).LoadAttributes(); err != nil {
c.Handle(500, "LoadAttributes", err) c.ServerError("RepositoryList.LoadAttributes", err)
return return
} }
c.Data["Repos"] = repos c.Data["Repos"] = repos
c.HTML(200, EXPLORE_REPOS) c.Success(EXPLORE_REPOS)
} }
type UserSearchOptions struct { type UserSearchOptions struct {
@ -102,7 +102,7 @@ func RenderUserSearch(c *context.Context, opts *UserSearchOptions) {
if len(keyword) == 0 { if len(keyword) == 0 {
users, err = opts.Ranger(page, opts.PageSize) users, err = opts.Ranger(page, opts.PageSize)
if err != nil { if err != nil {
c.Handle(500, "opts.Ranger", err) c.ServerError("Ranger", err)
return return
} }
count = opts.Counter() count = opts.Counter()
@ -115,7 +115,7 @@ func RenderUserSearch(c *context.Context, opts *UserSearchOptions) {
PageSize: opts.PageSize, PageSize: opts.PageSize,
}) })
if err != nil { if err != nil {
c.Handle(500, "SearchUserByName", err) c.ServerError("SearchUserByName", err)
return return
} }
} }
@ -124,7 +124,7 @@ func RenderUserSearch(c *context.Context, opts *UserSearchOptions) {
c.Data["Page"] = paginater.New(int(count), opts.PageSize, page, 5) c.Data["Page"] = paginater.New(int(count), opts.PageSize, page, 5)
c.Data["Users"] = users c.Data["Users"] = users
c.HTML(200, opts.TplName) c.Success(opts.TplName)
} }
func ExploreUsers(c *context.Context) { func ExploreUsers(c *context.Context) {

2
templates/.VERSION
View File

@ -1 +1 @@
0.11.27.0718 0.11.28.0718