opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-06-27 23:49:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show attachments in issues/comments and add preview for images

Browse Source
This commit is contained in:
Justin Nuß
2014-07-24 13:50:03 +02:00
parent fa1db64ff0
commit 43e5de7f83
5 changed files with 145 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
routers/repo/issue.go
View File

@ -709,6 +709,12 @@ func Comment(ctx *middleware.Context, params martini.Params) {
attachments := strings.Split(params["attachments"], ",")
for _, a := range attachments {
a = strings.Trim(a, " ")
if len(a) == 0 {
continue
}
aId, err := base.StrTo(a).Int64()
if err != nil {
@ -1002,12 +1008,23 @@ func UpdateMilestonePost(ctx *middleware.Context, params martini.Params, form au
}
func IssuePostAttachment(ctx *middleware.Context, params martini.Params) {
issueId, _ := base.StrTo(params["index"]).Int64()
index, _ := base.StrTo(params["index"]).Int64()
if issueId == 0 {
if index == 0 {
ctx.JSON(400, map[string]interface{}{
"ok": false,
"error": "invalid issue id",
"error": "invalid issue index",
})
return
}
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index)
if err != nil {
ctx.JSON(400, map[string]interface{}{
"ok": false,
"error": "invalid comment id",
})
return
@ -1089,7 +1106,7 @@ func IssuePostAttachment(ctx *middleware.Context, params martini.Params) {
return
}
a, err := models.CreateAttachment(issueId, commentId, header.Filename, out.Name())
a, err := models.CreateAttachment(issue.Id, commentId, header.Filename, out.Name())
if err != nil {
ctx.JSON(500, map[string]interface{}{
@ -1121,16 +1138,29 @@ func IssueGetAttachment(ctx *middleware.Context, params martini.Params) {
return
}
log.Error("path=%s name=%s", attachment.Path, attachment.Name)
ctx.ServeFile(attachment.Path, attachment.Name)
}
func IssueDeleteAttachment(ctx *middleware.Context, params martini.Params) {
issueId, _ := base.StrTo(params["index"]).Int64()
index, _ := base.StrTo(params["index"]).Int64()
if issueId == 0 {
if index == 0 {
ctx.JSON(400, map[string]interface{}{
"ok": false,
"error": "invalid issue id",
"error": "invalid issue index",
})
return
}
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, index)
if err != nil {
ctx.JSON(400, map[string]interface{}{
"ok": false,
"error": "invalid comment id",
})
return
@ -1189,7 +1219,7 @@ func IssueDeleteAttachment(ctx *middleware.Context, params martini.Params) {
return
}
if attachment.IssueId != issueId {
if attachment.IssueId != issue.Id {
ctx.JSON(400, map[string]interface{}{
"ok": false,
"error": "attachment not associated with the given issue",