diff options
| author | 赵智超 <1012112796@qq.com> | 2020-04-18 21:50:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 10:50:25 -0300 |
| commit | 1b86f174ce99b579df35c32e800551b1fd1df807 (patch) | |
| tree | e057206a13cea7a0e2eb0219bb66d8d83a8781c9 /models/issue_comment.go | |
| parent | 38d5f88a8183147cc5ecc6ece58fc28836a4af8b (diff) | |
| download | gitea-1b86f174ce99b579df35c32e800551b1fd1df807.tar.gz gitea-1b86f174ce99b579df35c32e800551b1fd1df807.zip | |
Add a way to mark Conversation (code comment) resolved (#11037)
* Add a way to mark Conversation (code comment) resolved
mark Conversation is a way to mark a Conversation is stale
or be solved. when it's marked as stale, will be hided like
stale. all Pull Request writer , Offical Reviewers and poster
can add or remove Conversation resolved mark.
Signed-off-by: a1012112796 <1012112796@qq.com>
* fix lint
* Apply suggestions from code review
* Add ResolveDoer
* fix ui
Co-Authored-By: Lauris BH <lauris@nix.lv>
Co-Authored-By: 6543 <6543@obermui.de>
* change IsResolved to an function
Add permission check in UpdateResolveConversation
* Apply suggestions from code review
* change return error for permisson check
* add default message for deleted user
* get issue message from comment
* add migration for ``ResolveDoerID`` column
another change:
* block mark pending review as resolved because it's not necessary
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
* change button color
* resolve button size
* fix code style
* remove unusefull code
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'models/issue_comment.go')
| -rw-r--r-- | models/issue_comment.go | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/models/issue_comment.go b/models/issue_comment.go index 2e59a2cb3f..f7017435d7 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -122,6 +122,8 @@ type Comment struct { AssigneeID int64 RemovedAssignee bool Assignee *User `xorm:"-"` + ResolveDoerID int64 + ResolveDoer *User `xorm:"-"` OldTitle string NewTitle string OldRef string @@ -420,6 +422,26 @@ func (c *Comment) LoadAssigneeUser() error { return nil } +// LoadResolveDoer if comment.Type is CommentTypeCode and ResolveDoerID not zero, then load resolveDoer +func (c *Comment) LoadResolveDoer() (err error) { + if c.ResolveDoerID == 0 || c.Type != CommentTypeCode { + return nil + } + c.ResolveDoer, err = getUserByID(x, c.ResolveDoerID) + if err != nil { + if IsErrUserNotExist(err) { + c.ResolveDoer = NewGhostUser() + err = nil + } + } + return +} + +// IsResolved check if an code comment is resolved +func (c *Comment) IsResolved() bool { + return c.ResolveDoerID != 0 && c.Type == CommentTypeCode +} + // LoadDepIssueDetails loads Dependent Issue Details func (c *Comment) LoadDepIssueDetails() (err error) { if c.DependentIssueID <= 0 || c.DependentIssue != nil { @@ -943,7 +965,12 @@ func fetchCodeCommentsByReview(e Engine, issue *Issue, currentUser *User, review if err := e.In("id", ids).Find(&reviews); err != nil { return nil, err } + for _, comment := range comments { + if err := comment.LoadResolveDoer(); err != nil { + return nil, err + } + if re, ok := reviews[comment.ReviewID]; ok && re != nil { // If the review is pending only the author can see the comments (except the review is set) if review.ID == 0 { |