summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-10-10 03:28:21 -0400
committerUnknwon <joe2010xtmf@163.com>2014-10-10 03:28:21 -0400
commitd78abd356186e5bfe841f5c70d9b907f5c288920 (patch)
treeed58a69d30e03ea29e9e40ef85d080fdfcdb3cad
parent79262173a6e0a5734ebfc1565e45353677008302 (diff)
downloadgitea-d78abd356186e5bfe841f5c70d9b907f5c288920.tar.gz
gitea-d78abd356186e5bfe841f5c70d9b907f5c288920.zip
Mirror fix on admin/orgs paging
-rw-r--r--gogs.go2
-rw-r--r--routers/admin/orgs.go2
-rw-r--r--routers/admin/users.go6
-rw-r--r--templates/.VERSION2
4 files changed, 6 insertions, 6 deletions
diff --git a/gogs.go b/gogs.go
index f38256220f..05fcd2cd9c 100644
--- a/gogs.go
+++ b/gogs.go
@@ -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 e813e47420..54d7af5cb3 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 e5cd364f3a..c9adf2d856 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 35a9c24283..d62a81b607 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