vikunja
/
vikunja
6
43
Fork 71
Code Issues 150 Pull Requests 18 Packages Releases 32 Activity

fix: Make sure labels are always exported as caldav #1412

Merged
konrad merged 2 commits from ce72/api:1272_export_labels_single_resource into main 2023-02-28 10:42:58 +00:00
Conversation 2 Commits 2 Files Changed 2 +5 -6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/models/tasks.go
View File

@ -1612,12 +1612,12 @@ func (t *Task) Delete(s *xorm.Session, a web.Auth) (err error) {
// @Router /tasks/{ID} [get]
func (t *Task) ReadOne(s *xorm.Session, a web.Auth) (err error) {
taskMap := make(map[int64]*Task, 1)
taskMap[t.ID] = &Task{}
*taskMap[t.ID], err = GetTaskByIDSimple(s, t.ID)
*t, err = GetTaskSimple(s, t)
if err != nil {
return
}
taskMap := make(map[int64]*Task, 1)
taskMap[t.ID] = t
err = addMoreInfoToTasks(s, taskMap, a)
if err != nil {

5
pkg/routes/caldav/listStorageProvider.go
View File

@ -210,7 +210,7 @@ func (vcls *VikunjaCaldavListStorage) GetResource(rpath string) (*data.Resource,
// save and override the updated unix date to not break any later etag checks
updated := vcls.task.Updated
task, err := models.GetTaskSimple(s, &models.Task{ID: vcls.task.ID, UID: vcls.task.UID})
err := vcls.task.ReadOne(s, vcls.user)
konrad commented 2023-02-27 21:21:09 +00:00
Review
Copy Link

Please use the ReadOne method of the Task model.

Please use the `ReadOne` method of the `Task` model.
ce72 commented 2023-02-27 22:50:39 +00:00
Review
Copy Link

Okay, I understand. Please check again.

Okay, I understand. Please check again.
if err != nil {
_ = s.Rollback()
if models.IsErrTaskDoesNotExist(err) {
@ -222,14 +222,13 @@ func (vcls *VikunjaCaldavListStorage) GetResource(rpath string) (*data.Resource,
return nil, false, err
}
vcls.task = &task
if updated.Unix() > 0 {
vcls.task.Updated = updated
}
rr := VikunjaListResourceAdapter{
list: vcls.list,
task: &task,
task: vcls.task,
}
r := data.NewResource(rpath, &rr)
return &r, true, nil