Merge pull request #561 from eryx/master

Fix pagination() to get the right total number of pages
This commit is contained in:
无闻 2014-10-13 22:47:21 -04:00
commit 1a38f0e0d9

View file

@ -5,6 +5,7 @@
package admin package admin
import ( import (
"math"
"strings" "strings"
"github.com/Unknwon/com" "github.com/Unknwon/com"
@ -30,7 +31,7 @@ func pagination(ctx *middleware.Context, count int64, pageNum int) int {
} }
curCount := int64((p-1)*pageNum + pageNum) curCount := int64((p-1)*pageNum + pageNum)
if curCount >= count { if curCount >= count {
p = int(count) / pageNum p = int(math.Ceil(float64(count) / float64(pageNum)))
} else { } else {
ctx.Data["NextPageNum"] = p + 1 ctx.Data["NextPageNum"] = p + 1
} }