diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | routers/admin/orgs.go | 2 | ||||
| -rw-r--r-- | routers/admin/users.go | 6 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -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()) diff --git a/routers/admin/orgs.go b/routers/admin/orgs.go index e813e474..54d7af5c 100644 --- a/routers/admin/orgs.go +++ b/routers/admin/orgs.go @@ -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) diff --git a/routers/admin/users.go b/routers/admin/users.go index e5cd364f..c9adf2d8 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -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 { diff --git a/templates/.VERSION b/templates/.VERSION index 35a9c242..d62a81b6 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.5.1009 Beta
\ No newline at end of file +0.5.5.1010 Beta
\ No newline at end of file |