ami/tl-vikunja
1
0
Fork 0
Code

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

Browse Source 
Authored-by: ce72 <christoph.ernst72@googlemail.com>
Reviewed-on: https://kolaente.dev/vikunja/api/pulls/1412
Reviewed-by: konrad <k@knt.li>
Co-authored-by: cernst <ce72@noreply.kolaente.de>
Co-committed-by: cernst <ce72@noreply.kolaente.de>
This commit is contained in:
cernst 2023-02-28 10:42:57 +00:00 committed by konrad
parent 53197b85e3
commit 1afc72e190
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] // @Router /tasks/{ID} [get]
func (t *Task) ReadOne(s *xorm.Session, a web.Auth) (err error) { func (t *Task) ReadOne(s *xorm.Session, a web.Auth) (err error) {
taskMap := make(map[int64]*Task, 1) *t, err = GetTaskSimple(s, t)
taskMap[t.ID] = &Task{}
*taskMap[t.ID], err = GetTaskByIDSimple(s, t.ID)
if err != nil { if err != nil {
return return
} }
taskMap := make(map[int64]*Task, 1)
taskMap[t.ID] = t
err = addMoreInfoToTasks(s, taskMap, a) err = addMoreInfoToTasks(s, taskMap, a)
if err != nil { 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 // save and override the updated unix date to not break any later etag checks
updated := vcls.task.Updated 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 { if err != nil {
_ = s.Rollback() _ = s.Rollback()
if models.IsErrTaskDoesNotExist(err) { if models.IsErrTaskDoesNotExist(err) {
@ -222,14 +222,13 @@ func (vcls *VikunjaCaldavListStorage) GetResource(rpath string) (*data.Resource,
return nil, false, err return nil, false, err
} }
vcls.task = &task
if updated.Unix() > 0 { if updated.Unix() > 0 {
vcls.task.Updated = updated vcls.task.Updated = updated
} }
rr := VikunjaListResourceAdapter{ rr := VikunjaListResourceAdapter{
list: vcls.list, list: vcls.list,
task: &task, task: vcls.task,
} }
r := data.NewResource(rpath, &rr) r := data.NewResource(rpath, &rr)
return &r, true, nil return &r, true, nil