specialApe
/
gitea-1156
forked from Gitlink/gitea-1156
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add comment replies (#5104) 

* Add comment replies

* Replace reviewID with review.ID
This commit is contained in:
Jonas Franz 2018-10-22 22:13:35 +02:00 committed by techknowlogick
parent 9458880c06
commit f38fce916e
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/auth/repo_form.go
View File

@ -377,6 +377,7 @@ type CodeCommentForm struct {
Line int64 Line int64
TreePath string `form:"path" binding:"Required"` TreePath string `form:"path" binding:"Required"`
IsReview bool `form:"is_review"` IsReview bool `form:"is_review"`
Reply int64 `form:"reply"`
} }
// Validate validates the fields // Validate validates the fields

5
routers/repo/pull_review.go
View File

@ -63,6 +63,9 @@ func CreateCodeComment(ctx *context.Context, form auth.CodeCommentForm) {
} }
} }
} }
if review.ID == 0 {
review.ID = form.Reply
}
//FIXME check if line, commit and treepath exist //FIXME check if line, commit and treepath exist
comment, err := models.CreateCodeComment( comment, err := models.CreateCodeComment(
ctx.User, ctx.User,
@ -78,7 +81,7 @@ func CreateCodeComment(ctx *context.Context, form auth.CodeCommentForm) {
return return
} }
// Send no notification if comment is pending // Send no notification if comment is pending
if !form.IsReview { if !form.IsReview || form.Reply != 0 {
notification.NotifyCreateIssueComment(ctx.User, issue.Repo, issue, comment) notification.NotifyCreateIssueComment(ctx.User, issue.Repo, issue, comment)
} }

4
templates/repo/diff/box.tmpl
View File

@ -151,7 +151,7 @@
{{ template "repo/diff/comments" dict "root" $ "comments" $line.Comments}} {{ template "repo/diff/comments" dict "root" $ "comments" $line.Comments}}
</ui> </ui>
</div> </div>
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "root" $ "comment" (index $line.Comments 0)}} {{template "repo/diff/comment_form_datahandler" dict "reply" (index $line.Comments 0).ReviewID "hidden" true "root" $ "comment" (index $line.Comments 0)}}
</div> </div>
{{end}} {{end}}
</td> </td>
@ -164,7 +164,7 @@
{{ template "repo/diff/comments" dict "root" $ "comments" $line.Comments}} {{ template "repo/diff/comments" dict "root" $ "comments" $line.Comments}}
</ui> </ui>
</div> </div>
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "root" $ "comment" (index $line.Comments 0)}} {{template "repo/diff/comment_form_datahandler" dict "reply" (index $line.Comments 0).ReviewID "hidden" true "root" $ "comment" (index $line.Comments 0)}}
</div> </div>
{{end}} {{end}}
</td> </td>

8
templates/repo/diff/comment_form.tmpl
View File

@ -25,19 +25,19 @@
<div class="footer"> <div class="footer">
<span class="markdown-info"><i class="octicon octicon-markdown"></i> {{$.root.i18n.Tr "repo.diff.comment.markdown_info"}}</span> <span class="markdown-info"><i class="octicon octicon-markdown"></i> {{$.root.i18n.Tr "repo.diff.comment.markdown_info"}}</span>
<div class="ui right floated"> <div class="ui right floated">
{{if not $.reply}} {{if $.reply}}
<button name="reply" value="{{$.reply}}" class="ui submit green tiny button btn-reply">{{$.root.i18n.Tr "repo.diff.comment.reply"}}</button>
{{else}}
{{if $.root.CurrentReview}} {{if $.root.CurrentReview}}
<button name="is_review" value="true" type="submit" <button name="is_review" value="true" type="submit"
class="ui submit green tiny button btn-add-comment">{{$.root.i18n.Tr "repo.diff.comment.add_review_comment"}}</button> class="ui submit green tiny button btn-add-comment">{{$.root.i18n.Tr "repo.diff.comment.add_review_comment"}}</button>
{{else}} {{else}}
<button name="is_review" value="true" type="submit" <button name="is_review" value="true" type="submit"
class="ui submit green tiny button btn-start-review">{{$.root.i18n.Tr "repo.diff.comment.start_review"}}</button> class="ui submit green tiny button btn-start-review">{{$.root.i18n.Tr "repo.diff.comment.start_review"}}</button>
{{end}}
{{end}}
{{if not $.root.CurrentReview}}
<button type="submit" <button type="submit"
class="ui submit tiny basic button btn-add-single">{{$.root.i18n.Tr "repo.diff.comment.add_single_comment"}}</button> class="ui submit tiny basic button btn-add-single">{{$.root.i18n.Tr "repo.diff.comment.add_single_comment"}}</button>
{{end}} {{end}}
{{end}}
{{if or (not $.HasComments) $.hidden}} {{if or (not $.HasComments) $.hidden}}
<button type="button" class="ui submit tiny basic button btn-cancel" onclick="cancelCodeComment(this);">{{$.root.i18n.Tr "cancel"}}</button> <button type="button" class="ui submit tiny basic button btn-cancel" onclick="cancelCodeComment(this);">{{$.root.i18n.Tr "cancel"}}</button>
{{end}} {{end}}

2
templates/repo/diff/section_unified.tmpl
View File

@ -32,7 +32,7 @@
{{ template "repo/diff/comments" dict "root" $.root "comments" $line.Comments}} {{ template "repo/diff/comments" dict "root" $.root "comments" $line.Comments}}
</ui> </ui>
</div> </div>
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "root" $.root "comment" (index $line.Comments 0)}} {{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index $line.Comments 0).ReviewID "root" $.root "comment" (index $line.Comments 0)}}
</div> </div>
</td> </td>
</tr> </tr>

2
templates/repo/issue/view_content/comments.tmpl
View File

@ -342,7 +342,7 @@
</div> </div>
{{end}} {{end}}
</div> </div>
{{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" true "root" $ "comment" (index $comms 0)}} {{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" (index $comms 0).ReviewID "root" $ "comment" (index $comms 0)}}
</div> </div>
</div> </div>
{{end}} {{end}}