fix: do not prefix tasks all the time

Fixes a regression from 29b9001078
This commit is contained in:
kolaente 2024-10-21 10:32:14 +02:00
parent 1cc3f3c7fe
commit 3ad5797307
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 7 additions and 4 deletions

View File

@ -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

View File

@ -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}