Browse Source

Hide outdated comments in file view (#5017)

* Hide outdated comments in file view

Signed-off-by: Jonas Franz <info@jonasfranz.software>

* Add unit test by adding "invalidated" comment to fixtures

Signed-off-by: Jonas Franz <info@jonasfranz.software>
tags/v1.6.0-dev
Jonas Franz 5 years ago
parent
commit
94cd7bb25b
2 changed files with 12 additions and 1 deletions
  1. 11
    0
      models/fixtures/comment.yml
  2. 1
    1
      models/issue_comment.go

+ 11
- 0
models/fixtures/comment.yml View File

@@ -41,3 +41,14 @@
tree_path: "README.md"
created_unix: 946684812
invalidated: false

-
id: 6
type: 21 # code comment
poster_id: 1
issue_id: 2
content: "it's already invalidated. boring..."
line: -4
tree_path: "README.md"
created_unix: 946684812
invalidated: true

+ 1
- 1
models/issue_comment.go View File

@@ -1084,7 +1084,7 @@ func fetchCodeCommentsByReview(e Engine, issue *Issue, currentUser *User, review
}
conds := opts.toConds()
if review.ID == 0 {
conds.And(builder.Eq{"invalidated": false})
conds = conds.And(builder.Eq{"invalidated": false})
}

var comments []*Comment

Loading…
Cancel
Save