coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mirror fix on admin/orgs paging

This commit is contained in:
Unknwon 2014-10-10 03:28:21 -04:00
parent 79262173a6
commit d78abd3561
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.5.5.1009 Beta" const APP_VER = "0.5.5.1010 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

2
routers/admin/orgs.go
View File

@ -25,7 +25,7 @@ func Organizations(ctx *middleware.Context) {
var err error var err error
ctx.Data["Orgs"], err = models.GetOrganizations(pageNum, (p-1)*pageNum) ctx.Data["Orgs"], err = models.GetOrganizations(pageNum, (p-1)*pageNum)
if err != nil { if err != nil {
ctx.Handle(500, "GetUsers", err) ctx.Handle(500, "GetOrganizations", err)
return return
} }
ctx.HTML(200, ORGS) ctx.HTML(200, ORGS)

6
routers/admin/users.go
View File

@ -24,14 +24,14 @@ const (
) )
func pagination(ctx *middleware.Context, count int64, pageNum int) int { func pagination(ctx *middleware.Context, count int64, pageNum int) int {
p := com.StrTo(ctx.Query("p")).MustInt() p := ctx.QueryInt("p")
if p < 1 { if p < 1 {
p = 1 p = 1
} }
curCount := int64((p-1)*pageNum + pageNum) curCount := int64((p-1)*pageNum + pageNum)
if curCount > count { if curCount >= count {
p = int(count) / pageNum p = int(count) / pageNum
} else if count > curCount { } else {
ctx.Data["NextPageNum"] = p + 1 ctx.Data["NextPageNum"] = p + 1
} }
if p > 1 { if p > 1 {

2
templates/.VERSION
View File

@ -1 +1 @@
0.5.5.1009 Beta 0.5.5.1010 Beta