Update services/pull/pull.go

a1012112796 · wxiaoguang · web-flow · commit 7a10bac34a95 · 2024-12-27T17:37:31.000+08:00
Co-authored-by: wxiaoguang &lt;wxiaoguang@gmail.com&gt;
diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -64,7 +64,8 @@ func NewPullRequest(ctx context.Context, opts *NewPullRequestOptions) error {
 	}
 
 	// user should be a collaborator or a member of the organization for base repo
-	if (!issue.Poster.IsAdmin) && pr.Flow == issues_model.PullRequestFlowGithub {
+	canCreate := issue.Poster.IsAdmin || pr.Flow == issues_model.PullRequestFlowAGit
+	if !canCreate {
 		canCreate, err := repo_model.IsOwnerMemberCollaborator(ctx, repo, issue.Poster.ID)
 		if err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@ func NewPullRequest(ctx context.Context, opts *NewPullRequestOptions) error {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// user should be a collaborator or a member of the organization for base repo`
`67`		`- if (!issue.Poster.IsAdmin) && pr.Flow == issues_model.PullRequestFlowGithub {`
	`67`	`+ canCreate := issue.Poster.IsAdmin \|\| pr.Flow == issues_model.PullRequestFlowAGit`
	`68`	`+ if !canCreate {`
`68`	`69`	`canCreate, err := repo_model.IsOwnerMemberCollaborator(ctx, repo, issue.Poster.ID)`
`69`	`70`	`if err != nil {`
`70`	`71`	`return err`