mirror of
https://github.com/harness/drone.git
synced 2025-05-10 02:39:18 +08:00
fix: [CODE-3057]: Revert "temporary fix for listing more than 30 repos in a single request" (#3324)
* Revert "fix: [code-2875]: temporary fix for listing more than 30 repos in a single request (#3134) (#3308)"
This reverts commit 636f6f2750
.
This commit is contained in:
parent
b501dbe44a
commit
d51474badc
@ -109,19 +109,6 @@ func ParseLimit(r *http.Request) int {
|
|||||||
return i
|
return i
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseLimit1000 extracts the limit parameter from the url.
|
|
||||||
// TODO: remove this ASAP, quick fix for issue: CODE-2875
|
|
||||||
func ParseLimit1000(r *http.Request) int {
|
|
||||||
s := r.URL.Query().Get(QueryParamLimit)
|
|
||||||
i, _ := strconv.Atoi(s)
|
|
||||||
if i <= 0 {
|
|
||||||
i = 500
|
|
||||||
} else if i > PerPageMax {
|
|
||||||
i = PerPageMax
|
|
||||||
}
|
|
||||||
return i
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParseOrder extracts the order parameter from the url.
|
// ParseOrder extracts the order parameter from the url.
|
||||||
func ParseOrder(r *http.Request) enum.Order {
|
func ParseOrder(r *http.Request) enum.Order {
|
||||||
return enum.ParseOrder(
|
return enum.ParseOrder(
|
||||||
|
@ -70,7 +70,7 @@ func ParseRepoFilter(r *http.Request) (*types.RepoFilter, error) {
|
|||||||
Order: ParseOrder(r),
|
Order: ParseOrder(r),
|
||||||
Page: ParsePage(r),
|
Page: ParsePage(r),
|
||||||
Sort: ParseSortRepo(r),
|
Sort: ParseSortRepo(r),
|
||||||
Size: ParseLimit1000(r),
|
Size: ParseLimit(r),
|
||||||
Recursive: recursive,
|
Recursive: recursive,
|
||||||
DeletedAt: deletedAt,
|
DeletedAt: deletedAt,
|
||||||
DeletedBeforeOrAt: deletedBeforeOrAt,
|
DeletedBeforeOrAt: deletedBeforeOrAt,
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
package database
|
package database
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"cmp"
|
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
@ -870,7 +869,7 @@ func applyQueryFilter(stmt squirrel.SelectBuilder, filter *types.RepoFilter) squ
|
|||||||
}
|
}
|
||||||
|
|
||||||
func applySortFilter(stmt squirrel.SelectBuilder, filter *types.RepoFilter) squirrel.SelectBuilder {
|
func applySortFilter(stmt squirrel.SelectBuilder, filter *types.RepoFilter) squirrel.SelectBuilder {
|
||||||
stmt = stmt.Limit(uint64(cmp.Or(filter.Size, 500)))
|
stmt = stmt.Limit(database.Limit(filter.Size))
|
||||||
stmt = stmt.Offset(database.Offset(filter.Page, filter.Size))
|
stmt = stmt.Offset(database.Offset(filter.Page, filter.Size))
|
||||||
|
|
||||||
switch filter.Sort {
|
switch filter.Sort {
|
||||||
|
Loading…
Reference in New Issue
Block a user