From 1afc72e1906c02b093bb6d9748235b93ab0eb181 Mon Sep 17 00:00:00 2001 From: cernst Date: Tue, 28 Feb 2023 10:42:57 +0000 Subject: [PATCH] fix: Make sure labels are always exported as caldav (#1412) Authored-by: ce72 Reviewed-on: https://kolaente.dev/vikunja/api/pulls/1412 Reviewed-by: konrad Co-authored-by: cernst Co-committed-by: cernst --- pkg/models/tasks.go | 6 +++--- pkg/routes/caldav/listStorageProvider.go | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go index f51495b88..130b8f2b5 100644 --- a/pkg/models/tasks.go +++ b/pkg/models/tasks.go @@ -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 { diff --git a/pkg/routes/caldav/listStorageProvider.go b/pkg/routes/caldav/listStorageProvider.go index 0d1692c18..e2c5d3c8b 100644 --- a/pkg/routes/caldav/listStorageProvider.go +++ b/pkg/routes/caldav/listStorageProvider.go @@ -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) 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