fix

Author: wxiaoguang

modules/paginator/paginator.go

@@ -32,24 +32,24 @@ Output:
 
 // Paginator represents a set of results of pagination calculations.
 type Paginator struct {
-	total     int // total rows count
-	pagingNum int // how many rows in one page
-	current   int // current page number
-	numPages  int // how many pages to show on the UI
+	total      int // total rows count
+	totalPages int
+	pagingNum  int // how many rows in one page
+	current    int // current page number
+	numPages   int // how many pages to show on the UI
 }
 
 // New initialize a new pagination calculation and returns a Paginator as result.
 func New(total, pagingNum, current, numPages int) *Paginator {
-	if pagingNum <= 0 {
-		pagingNum = 1
-	}
-	if current <= 0 {
-		current = 1
-	}
-	p := &Paginator{total, pagingNum, current, numPages}
-	if p.current > p.TotalPages() {
-		p.current = p.TotalPages()
-	}
+	pagingNum = max(pagingNum, 1)
+	totalPages := (total + pagingNum - 1) / pagingNum
+	if total >= 0 {
+		current = min(current, totalPages)
+	} else {
+		totalPages = -1
+	}
+	current = max(current, 1)
+	p := &Paginator{total, totalPages, pagingNum, current, numPages}
 	return p
 }
 
@@ -72,7 +72,7 @@ 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 > p.current*p.pagingNum
+	return p.total == -1 || p.current*p.pagingNum < p.total
 }
 
 func (p *Paginator) Next() int {
@@ -84,10 +84,7 @@ func (p *Paginator) Next() int {
 
 // IsLast returns true if current page is the last page.
 func (p *Paginator) IsLast() bool {
-	if p.total == 0 {
-		return true
-	}
-	return p.total > (p.current-1)*p.pagingNum && !p.HasNext()
+	return !p.HasNext()
 }
 
 // Total returns number of total rows.
@@ -97,10 +94,7 @@ func (p *Paginator) Total() int {
 
 // TotalPages returns number of total pages.
 func (p *Paginator) TotalPages() int {
-	if p.total == 0 {
-		return 1
-	}
-	return (p.total + p.pagingNum - 1) / p.pagingNum
+	return p.totalPages
 }
 
 // Current returns current page number.
@@ -134,8 +128,8 @@ func getMiddleIdx(numPages int) int {
 // Pages returns a list of nearby page numbers relative to current page.
 // If value is -1 means "..." that more pages are not showing.
 func (p *Paginator) Pages() []*Page {
-	if p.numPages == 0 {
-		return []*Page{}
+	if p.total == -1 || p.numPages == 0 {
+		return nil
 	} else if p.numPages == 1 && p.TotalPages() == 1 {
 		// Only show current page.
 		return []*Page{{1, true}}

modules/paginator/paginator_test.go

@@ -76,9 +76,7 @@ func TestPaginator(t *testing.T) {
 	t.Run("Only current page", func(t *testing.T) {
 		p := New(0, 10, 1, 1)
 		pages := p.Pages()
-		assert.Len(t, pages, 1)
-		assert.Equal(t, 1, pages[0].Num())
-		assert.True(t, pages[0].IsCurrent())
+		assert.Empty(t, pages) // no "total", so no pages
 
 		p = New(1, 10, 1, 1)
 		pages = p.Pages()

templates/base/paginate.tmpl

@@ -2,13 +2,17 @@
 {{$paginationLink := $.Link}}
 {{if eq $paginationLink AppSubUrl}}{{$paginationLink = print $paginationLink "/"}}{{end}}
 {{with .Page.Paginater}}
-	{{if gt .TotalPages 1}}
+	{{if .TotalPages}}
+		{{$showFirstLast := gt .TotalPages 0}}
 		<div class="center page buttons">
 			<div class="ui borderless pagination menu">
+				{{if $showFirstLast}}
 				<a class="{{if .IsFirst}}disabled{{end}} item navigation" {{if not .IsFirst}}href="{{$paginationLink}}{{if $paginationParams}}?{{$paginationParams}}{{end}}"{{end}}>
 					{{svg "gitea-double-chevron-left" 16 "tw-mr-1"}}
 					<span class="navigation_label">{{ctx.Locale.Tr "admin.first_page"}}</span>
 				</a>
+				{{end}}
+
 				<a class="{{if not .HasPrevious}}disabled{{end}} item navigation" {{if .HasPrevious}}href="{{$paginationLink}}?page={{.Previous}}{{if $paginationParams}}&{{$paginationParams}}{{end}}"{{end}}>
 					{{svg "octicon-chevron-left" 16 "tw-mr-1"}}
 					<span class="navigation_label">{{ctx.Locale.Tr "repo.issues.previous"}}</span>
@@ -24,10 +28,13 @@
 					<span class="navigation_label">{{ctx.Locale.Tr "repo.issues.next"}}</span>
 					{{svg "octicon-chevron-right" 16 "tw-ml-1"}}
 				</a>
+
+				{{if $showFirstLast}}
 				<a class="{{if .IsLast}}disabled{{end}} item navigation" {{if not .IsLast}}href="{{$paginationLink}}?page={{.TotalPages}}{{if $paginationParams}}&{{$paginationParams}}{{end}}"{{end}}>
 					<span class="navigation_label">{{ctx.Locale.Tr "admin.last_page"}}</span>
 					{{svg "gitea-double-chevron-right" 16 "tw-ml-1"}}
 				</a>
+				{{end}}
 			</div>
 		</div>
 	{{end}}