diff options
author | 无闻 <u@gogs.io> | 2015-09-25 19:05:27 -0400 |
---|---|---|
committer | 无闻 <u@gogs.io> | 2015-09-25 19:05:27 -0400 |
commit | 84c727ae6657c89885a5039a4dcd77d6be3fcf01 (patch) | |
tree | e60259775b75da7a1d5e709264dc80632423f9f3 /routers/admin | |
parent | ee1256cf74f7f42f19fa22f77100aed78ad94987 (diff) | |
parent | dfc16d08790f446e321df24c01ae2800507e2a22 (diff) | |
download | gitea-84c727ae6657c89885a5039a4dcd77d6be3fcf01.tar.gz gitea-84c727ae6657c89885a5039a4dcd77d6be3fcf01.zip |
Merge pull request #1693 from sapk/fix-admin-repo-new-ui
Fix admin repos new ui
Diffstat (limited to 'routers/admin')
-rw-r--r-- | routers/admin/repos.go | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/routers/admin/repos.go b/routers/admin/repos.go index 3f63887139..d1d97b279b 100644 --- a/routers/admin/repos.go +++ b/routers/admin/repos.go @@ -5,17 +5,20 @@ package admin import ( + "github.com/Unknwon/paginater" "math" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/middleware" + "github.com/gogits/gogs/modules/setting" ) const ( REPOS base.TplName = "admin/repo/list" ) +//* TODO Remove after general using of github.com/Unknwon/paginater func pagination(ctx *middleware.Context, count int64, pageNum int) int { p := ctx.QueryInt("p") if p < 1 { @@ -33,19 +36,28 @@ func pagination(ctx *middleware.Context, count int64, pageNum int) int { return p } +//*/ func Repositories(ctx *middleware.Context) { ctx.Data["Title"] = ctx.Tr("admin.repositories") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminRepositories"] = true - pageNum := 50 - p := pagination(ctx, models.CountRepositories(), pageNum) + total := models.CountRepositories() + page := ctx.QueryInt("page") + if page <= 1 { + page = 1 + } + ctx.Data["Page"] = paginater.New(int(total), setting.AdminRepoPagingNum, page, 5) + + repos, err := models.RepositoriesWithUsers(page, setting.AdminRepoPagingNum) - var err error - ctx.Data["Repos"], err = models.GetRepositoriesWithUsers(pageNum, (p-1)*pageNum) if err != nil { - ctx.Handle(500, "GetRepositoriesWithUsers", err) + ctx.Handle(500, "RepositoriesWithUsers", err) return } + + ctx.Data["Repos"] = repos + ctx.Data["Total"] = total + ctx.HTML(200, REPOS) } |