mirror of
https://github.com/go-vikunja/vikunja.git
synced 2026-03-11 17:48:44 -05:00
fix: load file content before generating attachment preview
LoadFileByID() was called after the preview branch, so GetPreview() received a nil io.Reader causing a panic in image.Decode.
This commit is contained in:
@@ -184,6 +184,13 @@ func GetTaskAttachment(c *echo.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// Open the file so its content is available for preview generation and download
|
||||
err = taskAttachment.File.LoadFileByID()
|
||||
if err != nil {
|
||||
_ = s.Rollback()
|
||||
return err
|
||||
}
|
||||
|
||||
// If the preview query parameter is set, get the preview (cached or generate)
|
||||
previewSize := models.GetPreviewSizeFromString(c.QueryParam("preview_size"))
|
||||
if previewSize != models.PreviewSizeUnknown && strings.HasPrefix(taskAttachment.File.Mime, "image") {
|
||||
@@ -193,13 +200,6 @@ func GetTaskAttachment(c *echo.Context) error {
|
||||
}
|
||||
}
|
||||
|
||||
// Open and send the file to the client
|
||||
err = taskAttachment.File.LoadFileByID()
|
||||
if err != nil {
|
||||
_ = s.Rollback()
|
||||
return err
|
||||
}
|
||||
|
||||
if err := s.Commit(); err != nil {
|
||||
_ = s.Rollback()
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user