finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix upload attachments (#6481)

Browse source 
* fix upload attachments

* add migration for new column uploader_id on table attachment

* fix imports sequence
This commit is contained in:
Lunny Xiao 2019-04-03 03:25:05 +08:00 • committed by techknowlogick
parent 0a8e63c682
commit 09fb036ad6
7 changed files with 76 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
routers/api/v1/repo/release_attachment.go
View file

@ -200,16 +200,16 @@ func CreateReleaseAttachment(ctx *context.APIContext) {
}
// Create a new attachment and save the file
attach, err := models.NewAttachment(filename, buf, file)
attach, err := models.NewAttachment(&models.Attachment{
UploaderID: ctx.User.ID,
Name: filename,
ReleaseID: release.ID,
}, buf, file)
if err != nil {
ctx.Error(500, "NewAttachment", err)
return
}
attach.ReleaseID = release.ID
if err := models.UpdateAttachment(attach); err != nil {
ctx.Error(500, "UpdateAttachment", err)
return
}
ctx.JSON(201, attach.APIFormat())
}

5
routers/repo/attachment.go
View file

@ -60,7 +60,10 @@ func UploadAttachment(ctx *context.Context) {
return
}
attach, err := models.NewAttachment(header.Filename, buf, file)
attach, err := models.NewAttachment(&models.Attachment{
UploaderID: ctx.User.ID,
Name: header.Filename,
}, buf, file)
if err != nil {
ctx.Error(500, fmt.Sprintf("NewAttachment: %v", err))
return

5
routers/routes/routes.go
View file

@ -480,9 +480,12 @@ func RegisterRoutes(m *macaron.Macaron) {
return
}
})
m.Post("/attachments", repo.UploadAttachment)
}, ignSignIn)
m.Group("", func() {
m.Post("/attachments", repo.UploadAttachment)
}, reqSignIn)
m.Group("/:username", func() {
m.Get("/action/:action", user.Action)
}, reqSignIn)