zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-06 06:06:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/client-auth

Browse Source
This commit is contained in:
Rush Tehrani
2020-02-19 16:02:37 -08:00
committed by GitHub
parent ed49c39795 8dfd184378
commit 161a6b6677
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/workflow_server.go
View File

@@ -171,10 +171,6 @@ func (s *WorkflowServer) ListWorkflows(ctx context.Context, req *api.ListWorkflo
req.PageSize = 15 req.PageSize = 15
} }
if req.Page <= 0 {
req.Page = 1
}
workflows, err := client.ListWorkflows(req.Namespace, req.WorkflowTemplateUid, req.WorkflowTemplateVersion) workflows, err := client.ListWorkflows(req.Namespace, req.WorkflowTemplateUid, req.WorkflowTemplateVersion)
if errors.As(err, &userError) { if errors.As(err, &userError) {
return nil, userError.GRPCError() return nil, userError.GRPCError()
@@ -190,6 +186,10 @@ func (s *WorkflowServer) ListWorkflows(ctx context.Context, req *api.ListWorkflo
req.Page = pages req.Page = pages
} }
if req.Page <= 0 {
req.Page = 1
}
start := (req.Page - 1) * req.PageSize start := (req.Page - 1) * req.PageSize
end := start + req.PageSize end := start + req.PageSize
if end >= int32(len(apiWorkflows)) { if end >= int32(len(apiWorkflows)) {