Add a way to mark Conversation (code comment) resolved

models/issue_comment.go

@@ -429,7 +429,11 @@ func (c *Comment) LoadResolveDoer() (err error) {
 	}
 	c.ResolveDoer, err = getUserByID(x, c.ResolveDoerID)
 	if err != nil {
-		return
+		if IsErrUserNotExist(err) {
+			c.ResolveDoerID = -1
+			c.ResolveDoer = NewGhostUser()
+			err = nil
+		}
 	}
 	return
 }

models/migrations/migrations.go

@@ -204,6 +204,8 @@ var migrations = []Migration{
 	NewMigration("Refix merge base for merged pull requests", refixMergeBase),
 	// v135 -> 136
 	NewMigration("Add OrgID column to Labels table", addOrgIDLabelColumn),
+	// v136 -> 137
+	NewMigration("Add ResolveDoerID to Comment table", addResolveDoerIDCommentColumn),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v136.go

@@ -0,0 +1,22 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"fmt"
+
+	"xorm.io/xorm"
+)
+
+func addResolveDoerIDCommentColumn(x *xorm.Engine) error {
+	type Comment struct {
+		ResolveDoerID int64
+	}
+
+	if err := x.Sync2(new(Comment)); err != nil {
+		return fmt.Errorf("Sync2: %v", err)
+	}
+	return nil
+}

models/review.go

@@ -631,11 +631,9 @@ func CanMarkConversation(issue *Issue, doer *User) (permResult bool, err error)
 	}
 
 	if doer.ID != issue.PosterID {
-		if issue.Repo == nil {
-			err = issue.LoadRepo()
-			if err != nil {
-				return false, err
-			}
+		err = issue.LoadRepo()
+		if err != nil {
+			return false, err
 		}
 
 		perm, err := GetUserRepoPermission(issue.Repo, doer)

routers/repo/pull_review.go

@@ -64,34 +64,31 @@ func CreateCodeComment(ctx *context.Context, form auth.CodeCommentForm) {
 // UpdateResolveConversation add or remove an Conversation resolved mark
 func UpdateResolveConversation(ctx *context.Context) {
 	action := ctx.Query("action")
-	issueID := ctx.QueryInt64("issue_id")
 	commentID := ctx.QueryInt64("comment_id")
 
-	issue, err := models.GetIssueByID(issueID)
+	comment, err := models.GetCommentByID(commentID)
 	if err != nil {
 		ctx.ServerError("GetIssueByID", err)
 		return
 	}
 
+	if err = comment.LoadIssue(); err != nil {
+		ctx.ServerError("comment.LoadIssue", err)
+		return
+	}
+
 	var permResult bool
-	if permResult, err = models.CanMarkConversation(issue, ctx.User); err != nil {
+	if permResult, err = models.CanMarkConversation(comment.Issue, ctx.User); err != nil {
 		ctx.ServerError("CanMarkConversation", err)
 		return
 	}
 	if !permResult {
-		ctx.ServerError("UpdateResolveConversation",
-			fmt.Errorf("doer can't permission [usser_id: %d, issue_id: %d]",
-				ctx.User.ID, issue.ID))
-		return
-	}
-
-	if !issue.IsPull {
+		ctx.Error(403)
 		return
 	}
 
-	comment, err := models.GetCommentByID(commentID)
-	if err != nil {
-		ctx.ServerError("GetCommentByID", err)
+	if !comment.Issue.IsPull {
+		ctx.Error(400)
 		return
 	}
 
@@ -102,7 +99,7 @@ func UpdateResolveConversation(ctx *context.Context) {
 			return
 		}
 	} else {
-		ctx.ServerError("UpdateResolveConversation", fmt.Errorf("error action : %s", action))
+		ctx.Error(400)
 		return
 	}
 

templates/repo/diff/box.tmpl

@@ -149,6 +149,7 @@
 														{{if gt (len $line.Comments) 0}}
 															{{$resolved := (index $line.Comments 0).IsResolved}}
 															{{$resolveDoer := (index $line.Comments 0).ResolveDoer}}
+															{{$isNotPending := (not (eq (index $line.Comments 0).Review.Type 0))}}
 															<tr class="add-code-comment">
 																<td class="lines-num"></td>
 																<td class="lines-type-marker"></td>
@@ -174,8 +175,8 @@
 																				</ui>
 																			</div>
 																		{{template "repo/diff/comment_form_datahandler" dict "reply" (index $line.Comments 0).ReviewID "hidden" true "root" $ "comment" (index $line.Comments 0)}}
-																			{{if $.CanMarkConversation }}
-																				<button class="ui green icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-issue-id="{{$.Issue.ID}}"  data-comment-id="{{(index $line.Comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation" >
+																			{{if and $.CanMarkConversation $isNotPending}}
+																				<button class="ui green icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index $line.Comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation" >
 																					{{if $resolved}}
 																						{{$.i18n.Tr "repo.issues.review.un_resolve_conversation"}}
 																					{{else}}
@@ -210,8 +211,8 @@
 																				</ui>
 																			</div>
 																			{{template "repo/diff/comment_form_datahandler" dict "reply" (index $line.Comments 0).ReviewID "hidden" true "root" $ "comment" (index $line.Comments 0)}}
-																			{{if $.CanMarkConversation}}
-																				<button class="ui green icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-issue-id="{{$.Issue.ID}}"  data-comment-id="{{(index $line.Comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation" >
+																			{{if and $.CanMarkConversation $isNotPending}}
+																				<button class="ui green icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index $line.Comments 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation" >
 																					{{if $resolved}}
 																						{{$.i18n.Tr "repo.issues.review.un_resolve_conversation"}}
 																					{{else}}

templates/repo/diff/section_unified.tmpl

@@ -25,6 +25,7 @@
 		{{if gt (len $line.Comments) 0}}
 			{{$resolved := (index $line.Comments 0).IsResolved}}
 			{{$resolveDoer := (index $line.Comments 0).ResolveDoer}}
+			{{$isNotPending := (not (eq (index $line.Comments 0).Review.Type 0))}}
 		<tr>
 			<td colspan="2" class="lines-num"></td>
 			<td class="lines-type-marker"></td>
@@ -49,8 +50,8 @@
 						</ui>
 					</div>
 					{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index $line.Comments 0).ReviewID "root" $.root "comment" (index $line.Comments 0)}}
-					{{if $.root.CanMarkConversation}}
-						<button class="ui green icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-issue-id="{{$.root.Issue.ID}}"  data-comment-id="{{(index $line.Comments 0).ID}}" data-update-url="{{$.root.RepoLink}}/issues/resolve_conversation" >
+					{{if and $.root.CanMarkConversation $isNotPending}}
+						<button class="ui green icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index $line.Comments 0).ID}}" data-update-url="{{$.root.RepoLink}}/issues/resolve_conversation" >
 							{{if $resolved}}
 								{{$.root.i18n.Tr "repo.issues.review.un_resolve_conversation"}}
 							{{else}}

templates/repo/issue/view_content/comments.tmpl

@@ -391,6 +391,7 @@
 									{{$invalid := (index $comms 0).Invalidated}}
 									{{$resolved := (index $comms 0).IsResolved}}
 									{{$resolveDoer := (index $comms 0).ResolveDoer}}
+									{{$isNotPending := (not (eq (index $comms 0).Review.Type 0))}}
 								{{if or $invalid $resolved}}
 									<button id="show-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="ui compact right labeled button show-outdated">
 										{{svg "octicon-unfold" 16}}
@@ -457,8 +458,8 @@
 									</div>
 									{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index $comms 0).ReviewID "root" $ "comment" (index $comms 0)}}
 
-									{{if $.CanMarkConversation}}
-										<button class="ui green icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-issue-id="{{$.Issue.ID}}"  data-comment-id="{{(index $comms 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation" >
+									{{if and $.CanMarkConversation $isNotPending}}
+										<button class="ui green icon tiny button resolve-conversation" data-action="{{if not $resolved}}Resolve{{else}}UnResolve{{end}}" data-comment-id="{{(index $comms 0).ID}}" data-update-url="{{$.RepoLink}}/issues/resolve_conversation" >
 											{{if $resolved}}
 												{{$.i18n.Tr "repo.issues.review.un_resolve_conversation"}}
 											{{else}}

web_src/js/index.js

@@ -2569,13 +2569,11 @@ $(document).ready(async () => {
     e.preventDefault();
     const id = $(this).data('comment-id');
     const action = $(this).data('action');
-    const issue_id = $(this).data('issue-id');
     const url = $(this).data('update-url');
 
     $.post(url, {
       _csrf: csrf,
       action,
-      issue_id,
       comment_id: id,
     }).then(reload);
   });