From 1635beda5655fb75f54a8f0eb1868cfec209693c Mon Sep 17 00:00:00 2001 From: kolaente Date: Tue, 2 Feb 2021 22:20:10 +0100 Subject: [PATCH] Fix getting task attachments and related tasks if none are available --- pkg/models/task_attachment.go | 4 ++++ pkg/models/tasks.go | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/pkg/models/task_attachment.go b/pkg/models/task_attachment.go index 4c557cb71..6d7e70925 100644 --- a/pkg/models/task_attachment.go +++ b/pkg/models/task_attachment.go @@ -209,6 +209,10 @@ func getTaskAttachmentsByTaskIDs(s *xorm.Session, taskIDs []int64) (attachments return } + if len(attachments) == 0 { + return + } + fileIDs := []int64{} userIDs := []int64{} for _, a := range attachments { diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go index 94a6a6081..3ee2edc65 100644 --- a/pkg/models/tasks.go +++ b/pkg/models/tasks.go @@ -597,6 +597,11 @@ func addRelatedTasksToTasks(s *xorm.Session, taskIDs []int64, taskMap map[int64] for _, rt := range relatedTasks { relatedTaskIDs = append(relatedTaskIDs, rt.OtherTaskID) } + + if len(relatedTaskIDs) == 0 { + return + } + fullRelatedTasks := make(map[int64]*Task) err = s.In("id", relatedTaskIDs).Find(&fullRelatedTasks) if err != nil {