From 1dc14d5ddf9f965560e1c807443acb3e5442485a Mon Sep 17 00:00:00 2001 From: konrad Date: Fri, 22 Mar 2019 22:03:41 +0100 Subject: [PATCH] Fixed labels not being queried correctly on tasks --- pkg/models/label_task.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/models/label_task.go b/pkg/models/label_task.go index 4fc56fa0..cda8c9f6 100644 --- a/pkg/models/label_task.go +++ b/pkg/models/label_task.go @@ -153,7 +153,7 @@ func getLabelsByTaskIDs(opts *LabelByTaskIDsOptions) (ls []*labelWithTaskID, err requestOrNil = "label_task.label_id != null OR labels.created_by_id = ?" } - // Get all labels associated with these labels + // Get all labels associated with these tasks var labels []*labelWithTaskID err = x.Table("labels"). Select("labels.*, label_task.task_id"). @@ -161,7 +161,7 @@ func getLabelsByTaskIDs(opts *LabelByTaskIDsOptions) (ls []*labelWithTaskID, err Where(requestOrNil, uidOrNil). Or(builder.In("label_task.task_id", opts.TaskIDs)). And("labels.title LIKE ?", "%"+opts.Search+"%"). - GroupBy("labels.id"). + GroupBy("labels.id,label_task.task_id"). // This filters out doubles Limit(getLimitFromPageIndex(opts.Page)). Find(&labels) if err != nil {