fix paging

Author: wxiaoguang

modules/paginator/paginator.go

@@ -36,9 +36,11 @@ Output:
 type Paginator struct {
 	total      int // total rows count, -1 means unknown
 	totalPages int // total pages count, -1 means unknown
-	pagingNum  int // how many rows in one page
 	current    int // current page number
-	numPages   int // how many pages to show on the UI
+	curRows    int // current page rows count
+
+	pagingNum int // how many rows in one page
+	numPages  int // how many pages to show on the UI
 }
 
 // New initialize a new pagination calculation and returns a Paginator as result.
@@ -49,7 +51,22 @@ func New(total, pagingNum, current, numPages int) *Paginator {
 		current = min(current, totalPages)
 	}
 	current = max(current, 1)
-	return &Paginator{total, totalPages, pagingNum, current, numPages}
+	return &Paginator{
+		total:      total,
+		totalPages: totalPages,
+		current:    current,
+		pagingNum:  pagingNum,
+		numPages:   numPages,
+	}
+}
+
+func (p *Paginator) SetCurRows(rows int) {
+	p.curRows = rows
+	if p.total == -1 && p.current == 1 && !p.HasNext() {
+		// if there is only one page for the "unlimited paging", set total rows/pages count
+		p.total = rows
+		p.totalPages = 1
+	}
 }
 
 // IsFirst returns true if current page is the first page.
@@ -71,7 +88,10 @@ func (p *Paginator) Previous() int {
 
 // HasNext returns true if there is a next page relative to current page.
 func (p *Paginator) HasNext() bool {
-	return p.total == -1 || p.current*p.pagingNum < p.total
+	if p.total == -1 {
+		return p.curRows >= p.pagingNum
+	}
+	return p.current*p.pagingNum < p.total
 }
 
 func (p *Paginator) Next() int {

routers/web/user/home.go

@@ -137,11 +137,10 @@ func Dashboard(ctx *context.Context) {
 		return
 	}
 
-	ctx.Data["Feeds"] = feeds
-
-	pager := context.NewPagination(count, setting.UI.FeedPagingNum, page, 5)
+	pager := context.NewPagination(count, setting.UI.FeedPagingNum, page, 5).WithCurRows(len(feeds))
 	pager.AddParamFromRequest(ctx.Req)
 	ctx.Data["Page"] = pager
+	ctx.Data["Feeds"] = feeds
 
 	ctx.HTML(http.StatusOK, tplDashboard)
 }

services/context/pagination.go

@@ -28,6 +28,11 @@ func NewPagination(total, pagingNum, current, numPages int) *Pagination {
 	return p
 }
 
+func (p *Pagination) WithCurRows(n int) *Pagination {
+	p.Paginater.SetCurRows(n)
+	return p
+}
+
 func (p *Pagination) AddParamFromRequest(req *http.Request) {
 	for key, values := range req.URL.Query() {
 		if key == "page" || len(values) == 0 || (len(values) == 1 && values[0] == "") {

templates/user/dashboard/dashboard.tmpl

@@ -5,7 +5,7 @@
 		<div class="flex-container-main">
 			{{template "base/alert" .}}
 			{{template "user/heatmap" .}}
-			{{if .Feeds}}
+			{{if .Page.Paginater.TotalPages}}
 				{{template "user/dashboard/feeds" .}}
 			{{else}}
 				{{template "user/dashboard/guide" .}}