chore: merge upstream changes
All checks were successful
continuous-integration/drone/pr Build is passing
All checks were successful
continuous-integration/drone/pr Build is passing
This commit is contained in:
commit
9d67a5f628
|
@ -90,6 +90,7 @@ This document describes the different errors Vikunja can return.
|
||||||
| 4019 | 400 | Invalid task filter value. |
|
| 4019 | 400 | Invalid task filter value. |
|
||||||
| 4020 | 400 | The provided attachment does not belong to that task. |
|
| 4020 | 400 | The provided attachment does not belong to that task. |
|
||||||
| 4021 | 400 | This user is already assigned to that task. |
|
| 4021 | 400 | This user is already assigned to that task. |
|
||||||
|
| 4022 | 400 | The task has a relative reminder which does not specify relative to what. |
|
||||||
|
|
||||||
## Namespace
|
## Namespace
|
||||||
|
|
||||||
|
|
|
@ -898,7 +898,7 @@ func (err ErrReminderRelativeToMissing) HTTPError() web.HTTPError {
|
||||||
return web.HTTPError{
|
return web.HTTPError{
|
||||||
HTTPCode: http.StatusBadRequest,
|
HTTPCode: http.StatusBadRequest,
|
||||||
Code: ErrCodeReminderRelativeToMissing,
|
Code: ErrCodeReminderRelativeToMissing,
|
||||||
Message: "Relative reminder without relative_to",
|
Message: "Please provide what the reminder date is relative to",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -141,7 +141,12 @@ func (v *FileMigrator) Migrate(user *user.User, file io.ReaderAt, size int64) er
|
||||||
comment.ID = 0
|
comment.ID = 0
|
||||||
}
|
}
|
||||||
for _, attachment := range t.Attachments {
|
for _, attachment := range t.Attachments {
|
||||||
af, err := storedFiles[attachment.File.ID].Open()
|
attachmentFile, exists := storedFiles[attachment.File.ID]
|
||||||
|
if !exists {
|
||||||
|
log.Debugf(logPrefix+"Could not find attachment file %d for attachment %d", attachment.File.ID, attachment.ID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
af, err := attachmentFile.Open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("could not open attachment %d for reading: %w", attachment.ID, err)
|
return fmt.Errorf("could not open attachment %d for reading: %w", attachment.ID, err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user