Merge pull request #1358 from wansir/master

support querying resources without paging
2019-11-05 14:48:00 +08:00
parent 9822429c35 c1dccd4620
commit 857faac9c2
1 changed files with 1 additions and 4 deletions
--- a/pkg/server/params/params.go
+++ b/pkg/server/params/params.go
@@ -37,12 +37,9 @@ func ParsePaging(paging string) (limit, offset int) {

 	limit = 10
 	offset = 0
-	if groups := regexp.MustCompile(`^limit=(\d+),page=(\d+)$`).FindStringSubmatch(paging); len(groups) == 3 {
+	if groups := regexp.MustCompile(`^limit=(-?\d+),page=(\d+)$`).FindStringSubmatch(paging); len(groups) == 3 {
 		limit, _ = strconv.Atoi(groups[1])
 		page, _ := strconv.Atoi(groups[2])
-		if page < 0 {
-			page = 1
-		}
 		offset = (page - 1) * limit
 	}
 	return