tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions 1

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

Browse source 
* New approvals don't require content

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Fix edge-bug

Signed-off-by: jolheiser <john.olheiser@gmail.com>
This commit is contained in:
John Olheiser 2019-11-14 14:58:01 -06:00 committed by zeripath
parent ae36ed7ecb
commit 4b5ebb93e4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
models/review.go
View file

@ -254,7 +254,7 @@ func SubmitReview(doer *User, issue *Issue, reviewType ReviewType, content strin
return nil, nil, err return nil, nil, err
} }
if len(strings.TrimSpace(content)) == 0 { if reviewType != ReviewTypeApprove && len(strings.TrimSpace(content)) == 0 {
return nil, nil, ContentEmptyErr{} 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 { if err := review.loadCodeComments(sess); err != nil {
return nil, nil, err 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{} return nil, nil, ContentEmptyErr{}
} }