Hide outdated comments in file view (#5017)

jonasfranz · techknowlogick · commit 94cd7bb25b8f · 2018-10-05T11:49:30.000-04:00
* Hide outdated comments in file view

Signed-off-by: Jonas Franz &lt;info@jonasfranz.software&gt;

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

Signed-off-by: Jonas Franz &lt;info@jonasfranz.software&gt;
diff --git a/models/fixtures/comment.yml b/models/fixtures/comment.yml
@@ -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
diff --git a/models/issue_comment.go b/models/issue_comment.go
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1084,7 +1084,7 @@ func fetchCodeCommentsByReview(e Engine, issue Issue, currentUser User, review`
`1084`	`1084`	`}`
`1085`	`1085`	`conds := opts.toConds()`
`1086`	`1086`	`if review.ID == 0 {`
`1087`		`- conds.And(builder.Eq{"invalidated": false})`
	`1087`	`+ conds = conds.And(builder.Eq{"invalidated": false})`
`1088`	`1088`	`}`
`1089`	`1089`
`1090`	`1090`	`var comments []*Comment`