New review approvals shouldn't require a message (#8991)

jolheiser · zeripath · commit 4b5ebb93e48f · 2019-11-14T20:58:01.000Z
* New approvals don't require content

Signed-off-by: jolheiser &lt;john.olheiser@gmail.com&gt;

* Fix edge-bug

Signed-off-by: jolheiser &lt;john.olheiser@gmail.com&gt;
diff --git a/models/review.go b/models/review.go
@@ -254,7 +254,7 @@ func SubmitReview(doer *User, issue *Issue, reviewType ReviewType, content strin
 			return nil, nil, err
 		}
 
-		if len(strings.TrimSpace(content)) == 0 {
+		if reviewType != ReviewTypeApprove && len(strings.TrimSpace(content)) == 0 {
 			return nil, nil, ContentEmptyErr{}
 		}
 
@@ -272,7 +272,7 @@ func SubmitReview(doer *User, issue *Issue, reviewType ReviewType, content strin
 		if err := review.loadCodeComments(sess); err != nil {
 			return nil, nil, err
 		}
-		if len(review.CodeComments) == 0 && len(strings.TrimSpace(content)) == 0 {
+		if reviewType != ReviewTypeApprove && len(review.CodeComments) == 0 && len(strings.TrimSpace(content)) == 0 {
 			return nil, nil, ContentEmptyErr{}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ func SubmitReview(doer User, issue Issue, reviewType ReviewType, content strin`
`254`	`254`	`return nil, nil, err`
`255`	`255`	`}`
`256`	`256`
`257`		`- if len(strings.TrimSpace(content)) == 0 {`
	`257`	`+ if reviewType != ReviewTypeApprove && len(strings.TrimSpace(content)) == 0 {`
`258`	`258`	`return nil, nil, ContentEmptyErr{}`
`259`	`259`	`}`
`260`	`260`
`@@ -272,7 +272,7 @@ func SubmitReview(doer User, issue Issue, reviewType ReviewType, content strin`
`272`	`272`	`if err := review.loadCodeComments(sess); err != nil {`
`273`	`273`	`return nil, nil, err`
`274`	`274`	`}`
`275`		`- if len(review.CodeComments) == 0 && len(strings.TrimSpace(content)) == 0 {`
	`275`	`+ if reviewType != ReviewTypeApprove && len(review.CodeComments) == 0 && len(strings.TrimSpace(content)) == 0 {`
`276`	`276`	`return nil, nil, ContentEmptyErr{}`
`277`	`277`	`}`
`278`	`278`