MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-23 11:04:57 +01:00
Code Issues Releases Wiki Activity

Fix #321. Allow empty comments as long as there are attachments.

Browse source
This commit is contained in:
Justin Nuß 2014-07-25 08:01:34 +02:00
parent 30d7397f97
commit dedb156d4a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
routers/repo/issue.go
View file

@ -755,7 +755,8 @@ func Comment(ctx *middleware.Context, params martini.Params) {
var ms []string
content := ctx.Query("content")
if len(content) > 0 {
// Fix #321. Allow empty comments, as long as we have attachments.
if len(content) > 0 || len(ctx.Req.MultipartForm.File["attachments"]) > 0 {
switch params["action"] {
case "new":
if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.Id, 0, 0, models.COMMENT, content, nil); err != nil {
@ -1081,5 +1082,5 @@ func IssueGetAttachment(ctx *middleware.Context, params martini.Params) {
// Fix #312. Attachments with , in their name are not handled correctly by Google Chrome.
// We must put the name in " manually.
ctx.ServeFile(attachment.Path, "\"" + attachment.Name + "\"")
ctx.ServeFile(attachment.Path, "\""+attachment.Name+"\"")
}

4
templates/repo/issue/view.tmpl
View file

@ -72,7 +72,11 @@
<span class="role label label-default pull-right">Owner</span>
</div>
<div class="panel-body markdown">
{{if len .Content}}
{{str2html .Content}}
{{else}}
<i>No comment entered</i>
{{end}}
</div>
{{with $attachments := .Attachments}}
{{if $attachments}}