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

user/profile: paging doesn't respect private repository count (#4082)

Browse Source
This commit is contained in:
Unknwon 2017-02-15 05:39:36 -05:00
parent fd5881fb64
commit 4da325a45c
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
routers/user/profile.go
View File

@ -99,9 +99,10 @@ func Profile(ctx *context.Context) {
page = 1 page = 1
} }
showPrivate := ctx.IsSigned && (ctxUser.ID == ctx.User.ID || ctx.User.IsAdmin)
ctx.Data["Repos"], err = models.GetUserRepositories(&models.UserRepoOptions{ ctx.Data["Repos"], err = models.GetUserRepositories(&models.UserRepoOptions{
UserID: ctxUser.ID, UserID: ctxUser.ID,
Private: ctx.IsSigned && ctx.User.ID == ctxUser.ID, Private: showPrivate,
Page: page, Page: page,
PageSize: setting.UI.User.RepoPagingNum, PageSize: setting.UI.User.RepoPagingNum,
}) })
@ -109,7 +110,9 @@ func Profile(ctx *context.Context) {
ctx.Handle(500, "GetRepositories", err) ctx.Handle(500, "GetRepositories", err)
return return
} }
ctx.Data["Page"] = paginater.New(ctxUser.NumRepos, setting.UI.User.RepoPagingNum, page, 5)
count := models.CountUserRepositories(ctxUser.ID, showPrivate)
ctx.Data["Page"] = paginater.New(int(count), setting.UI.User.RepoPagingNum, page, 5)
} }
ctx.HTML(200, PROFILE) ctx.HTML(200, PROFILE)