record comment id instead of index of comment

Author: sillyguodong

routers/web/repo/issue.go

@@ -1420,11 +1420,12 @@ func ViewIssue(ctx *context.Context) {
 	}
 
 	var (
-		role                    issues_model.RoleDescriptor
-		ok                      bool
-		marked                  = make(map[int64]issues_model.RoleDescriptor)
-		participants            = make([]*user_model.User, 1, 10)
-		latestCloseCommentIndex int
+		role                 issues_model.RoleDescriptor
+		ok                   bool
+		marked               = make(map[int64]issues_model.RoleDescriptor)
+		comment              *issues_model.Comment
+		participants         = make([]*user_model.User, 1, 10)
+		latestCloseCommentID int64
 	)
 	if ctx.Repo.Repository.IsTimetrackerEnabled(ctx) {
 		if ctx.IsSigned {
@@ -1468,7 +1469,7 @@ func ViewIssue(ctx *context.Context) {
 
 	// Render comments and and fetch participants.
 	participants[0] = issue.Poster
-	for i, comment := range issue.Comments {
+	for _, comment = range issue.Comments {
 		comment.Issue = issue
 
 		if err := comment.LoadPoster(ctx); err != nil {
@@ -1623,12 +1624,13 @@ func ViewIssue(ctx *context.Context) {
 			// drop error since times could be pruned from DB..
 			_ = comment.LoadTime()
 		} else if comment.Type == issues_model.CommentTypeClose {
-			// record latest index of close comment.
-			latestCloseCommentIndex = i
+			// record ID of latest closed comment.
+			// if PR is closed, the comments after it won't be rendered.
+			latestCloseCommentID = comment.ID
 		}
 	}
 
-	ctx.Data["LatestCloseCommentIndex"] = latestCloseCommentIndex
+	ctx.Data["LatestCloseCommentID"] = latestCloseCommentID
 
 	// Combine multiple label assignments into a single comment
 	combineLabelComments(issue)

templates/repo/issue/view_content/comments.tmpl

@@ -1,6 +1,5 @@
 {{template "base/alert"}}
-<div>
-{{range $idx, $comment := .Issue.Comments}}
+{{range .Issue.Comments}}
 	{{if call $.ShouldShowCommentType .Type}}
 		{{$createdStr:= TimeSinceUnix .CreatedUnix $.locale}}
 
@@ -118,7 +117,7 @@
 					{{end}}
 				</span>
 			</div>
-			{{if and .Issue.IsClosed (eq $.LatestCloseCommentIndex $idx)}}
+			{{if and .Issue.IsClosed (eq $.LatestCloseCommentID .ID)}}
 				{{break}}
 			{{end}}
 		{{else if eq .Type 28}}
@@ -800,4 +799,3 @@
 		{{end}}
 	{{end}}
 {{end}}
-</div>