keep sure if assigneeIDs == nil -> do nothing

go-gitea · Nov 7, 2019 · e72d941 · e72d941
1 parent 1f90147
commit e72d941
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 31 deletions.
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
@@ -344,22 +344,24 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
 			return
 		}
 
-		// Check if the passed assignees is assignable
-		for _, aID := range assigneeIDs {
-			assignee, err := models.GetUserByID(aID)
-			if err != nil {
-				ctx.Error(500, "GetUserByID", err)
-				return
-			}
-
-			valid, err := models.CanBeAssigned(assignee, ctx.Repo.Repository, false)
-			if err != nil {
-				ctx.Error(500, "canBeAssigned", err)
-				return
-			}
-			if !valid {
-				ctx.Error(422, "canBeAssigned", models.ErrUserDoesNotHaveAccessToRepo{UserID: aID, RepoName: ctx.Repo.Repository.Name})
-				return
+		if assigneeIDs != nil {
+			for _, aID := range assigneeIDs {
+				assignee, err := models.GetUserByID(aID)
+				if err != nil {
+					ctx.Error(500, "GetUserByID", err)
+					return
+				}
+
+				// Check if the passed assignees is assignable
+				valid, err := models.CanBeAssigned(assignee, ctx.Repo.Repository, false)
+				if err != nil {
+					ctx.Error(500, "canBeAssigned", err)
+					return
+				}
+				if !valid {
+					ctx.Error(422, "canBeAssigned", models.ErrUserDoesNotHaveAccessToRepo{UserID: aID, RepoName: ctx.Repo.Repository.Name})
+					return
+				}
 			}
 		}
 	} else {

diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
@@ -286,22 +286,25 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption
 		}
 		return
 	}
-	// Check if the passed assignees is assignable
-	for _, aID := range assigneeIDs {
-		assignee, err := models.GetUserByID(aID)
-		if err != nil {
-			ctx.Error(500, "GetUserByID", err)
-			return
-		}
 
-		valid, err := models.CanBeAssigned(assignee, repo, true)
-		if err != nil {
-			ctx.Error(500, "canBeAssigned", err)
-			return
-		}
-		if !valid {
-			ctx.Error(422, "canBeAssigned", models.ErrUserDoesNotHaveAccessToRepo{UserID: aID, RepoName: repo.Name})
-			return
+	if assigneeIDs != nil {
+		for _, aID := range assigneeIDs {
+			assignee, err := models.GetUserByID(aID)
+			if err != nil {
+				ctx.Error(500, "GetUserByID", err)
+				return
+			}
+
+			// Check if the passed assignees is assignable
+			valid, err := models.CanBeAssigned(assignee, repo, true)
+			if err != nil {
+				ctx.Error(500, "canBeAssigned", err)
+				return
+			}
+			if !valid {
+				ctx.Error(422, "canBeAssigned", models.ErrUserDoesNotHaveAccessToRepo{UserID: aID, RepoName: repo.Name})
+				return
+			}
 		}
 	}