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>
go-gitea · Oct 5, 2018 · 94cd7bb · 94cd7bb
1 parent d7ca839
commit 94cd7bb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
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