domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Add support for single comments

Browse source 
Showing buttons in context

Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
Jonas Franz 2018-05-11 13:40:17 +02:00
parent 3e5f3c349e
commit 61cc13499a
No known key found for this signature in database
GPG key ID: 506AEEBE80BEDECD
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/auth/repo_form.go
View file

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

6
routers/repo/pull.go
View file

@ -477,7 +477,11 @@ func ViewPullFiles(ctx *context.Context) {
return return
} }
ctx.Data["CodeComments"] = pathToLineToComment ctx.Data["CodeComments"] = pathToLineToComment
ctx.Data["CurrentReview"], err = models.GetCurrentReview(ctx.User, issue)
if err != nil && !models.IsErrReviewNotExist(err) {
ctx.ServerError("GetCurrentReview", err)
return
}
ctx.HTML(200, tplPullFiles) ctx.HTML(200, tplPullFiles)
} }

15
templates/repo/diff/comment_form.tmpl
View file

@ -4,7 +4,6 @@
<input type="hidden" name="line" value="2"> <input type="hidden" name="line" value="2">
<input type="hidden" name="path" value="README.md"> <input type="hidden" name="path" value="README.md">
<input type="hidden" name="commit_id" value="e324f1688f063d6fd9268fb8f02149c9eb1a867c"> <input type="hidden" name="commit_id" value="e324f1688f063d6fd9268fb8f02149c9eb1a867c">
<input type="hidden" name="is_review" value="true">
<input type="hidden" name="diff_start_cid"> <input type="hidden" name="diff_start_cid">
<input type="hidden" name="diff_end_cid"> <input type="hidden" name="diff_end_cid">
<input type="hidden" name="diff_base_cid"> <input type="hidden" name="diff_base_cid">
@ -23,10 +22,16 @@
<div class="footer"> <div class="footer">
<span class="markdown-info"><i class="octicon octicon-markdown"></i> {{$.i18n.Tr "repo.diff.comment.markdown_info"}}</span> <span class="markdown-info"><i class="octicon octicon-markdown"></i> {{$.i18n.Tr "repo.diff.comment.markdown_info"}}</span>
<div class="ui right floated"> <div class="ui right floated">
<div class="ui submit tiny basic button btn-cancel">{{$.i18n.Tr "cancel"}}</div> {{if $.CurrentReview}}
<div class="ui submit tiny basic button btn-add-single">{{$.i18n.Tr "repo.diff.comment.add_single_comment"}}</div> <button name="is_review" value="true" type="submit"
<button type="submit" class="ui submit green tiny button btn-add-comment">{{$.i18n.Tr "repo.diff.comment.add_review_comment"}}</button> class="ui submit green tiny button btn-add-comment">{{$.i18n.Tr "repo.diff.comment.add_review_comment"}}</button>
<div class="ui submit green tiny button btn-start-review">{{$.i18n.Tr "repo.diff.comment.start_review"}}</div> {{else}}
<button name="is_review" value="true" type="submit"
class="ui submit green tiny button btn-start-review">{{$.i18n.Tr "repo.diff.comment.start_review"}}</button>
{{end}}
<button type="submit"
class="ui submit tiny basic button btn-add-single">{{$.i18n.Tr "repo.diff.comment.add_single_comment"}}</button>
<button type="button" class="ui submit tiny basic button btn-cancel">{{$.i18n.Tr "cancel"}}</button>
</div> </div>
</div> </div>
</form> </form>