Fix branch pagination error (#16805) (#16816)

lunny · web-flow · commit ab7e36e3a5b8 · 2021-08-25T11:11:54.000+01:00
Backport #16805 Fix #16801 Even if default branch is removed from the current page, but the total branches number should be still kept. So that the pagination calculation will be correct.
diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go
@@ -217,7 +217,7 @@ func loadBranches(ctx *context.Context, skip, limit int) ([]*Branch, int) {
 		branches = append(branches, deletedBranches...)
 	}
 
-	return branches, totalNumOfBranches - 1
+	return branches, totalNumOfBranches
 }
 
 func loadOneBranch(ctx *context.Context, rawBranch *git.Branch, protectedBranches []*models.ProtectedBranch,

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ func loadBranches(ctx context.Context, skip, limit int) ([]Branch, int) {`
`217`	`217`	`branches = append(branches, deletedBranches...)`
`218`	`218`	`}`
`219`	`219`
`220`		`- return branches, totalNumOfBranches - 1`
	`220`	`+ return branches, totalNumOfBranches`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`func loadOneBranch(ctx context.Context, rawBranch git.Branch, protectedBranches []*models.ProtectedBranch,`