From 3ad57973077a7e2143d3c0c820b0aae3c48a07dc Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Mon, 21 Oct 2024 10:32:14 +0200
Subject: [PATCH] fix: do not prefix tasks all the time

Fixes a regression from 29b90010785ae2e95b1abd99fa9740f18987eabb
---
 pkg/models/task_search.go | 5 +++++
 pkg/models/tasks.go       | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkg/models/task_search.go b/pkg/models/task_search.go
index fd244d8e3..a996bed19 100644
--- a/pkg/models/task_search.go
+++ b/pkg/models/task_search.go
@@ -179,6 +179,11 @@ func convertFiltersToDBFilterCond(rawFilters []*taskFilter, includeNulls bool) (
 			continue
 		}
 
+		if f.field == taskPropertyBucketID {
+			f.field = "task_buckets.`bucket_id`"
+		} else {
+			f.field = "tasks.`" + f.field + "`"
+		}
 		filter, err := getFilterCond(f, includeNulls)
 		if err != nil {
 			return nil, err
diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go
index b34a06c28..63df9856b 100644
--- a/pkg/models/tasks.go
+++ b/pkg/models/tasks.go
@@ -212,10 +212,8 @@ func (t *Task) ReadAll(_ *xorm.Session, _ web.Auth, _ string, _ int, _ int) (res
 }
 
 func getFilterCond(f *taskFilter, includeNulls bool) (cond builder.Cond, err error) {
-	field := "tasks.`" + f.field + "`"
-	if f.field == taskPropertyBucketID {
-		field = "task_buckets.`bucket_id`"
-	}
+	field := f.field
+
 	switch f.comparator {
 	case taskFilterComparatorEquals:
 		cond = &builder.Eq{field: f.value}