aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-10-29 08:17:31 -04:00
Code

Merge pull request #322 from nuss-justin/issue/321

Browse Source 
Fix #321. Allow empty comments as long as there are attachments.
This commit is contained in:
无闻 2014-07-25 02:41:22 -04:00
commit 204ef41b09
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 var ms []string
content := ctx.Query("content") 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"] { switch params["action"] {
case "new": case "new":
if comment, err = models.CreateComment(ctx.User.Id, ctx.Repo.Repository.Id, issue.Id, 0, 0, models.COMMENT, content, nil); err != nil { 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. // Fix #312. Attachments with , in their name are not handled correctly by Google Chrome.
// We must put the name in " manually. // 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> <span class="role label label-default pull-right">Owner</span>
</div> </div>
<div class="panel-body markdown"> <div class="panel-body markdown">
{{if len .Content}}
{{str2html .Content}} {{str2html .Content}}
{{else}}
<i>No comment entered</i>
{{end}}
</div> </div>
{{with $attachments := .Attachments}} {{with $attachments := .Attachments}}
{{if $attachments}} {{if $attachments}}