Mirror fix on admin/orgs paging

tokarchuk/v1.17
Unknwon 10 years ago
parent 79262173a6
commit d78abd3561
  1. 2
      gogs.go
  2. 2
      routers/admin/orgs.go
  3. 6
      routers/admin/users.go
  4. 2
      templates/.VERSION

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

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

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

@ -1 +1 @@
0.5.5.1009 Beta
0.5.5.1010 Beta
Loading…
Cancel
Save