kodev-org
/
vikunja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: replace all uses of bucket_id with the const

This commit is contained in:
kolaente 2024-10-02 10:43:51 +02:00
parent 425f6378c6
commit d81f2db6ef
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/models/kanban.go
View File

@ -226,9 +226,9 @@ func GetTasksInBucketsForView(s *xorm.Session, view *ProjectView, projects []*Pr
originalFilter := opts.filter
for id, bucket := range bucketMap {
if !strings.Contains(originalFilter, "bucket_id") {
if !strings.Contains(originalFilter, taskPropertyBucketID) {
var bucketFilter = "bucket_id = " + strconv.FormatInt(id, 10)
var bucketFilter = taskPropertyBucketID + " = " + strconv.FormatInt(id, 10)
if view.BucketConfigurationMode == BucketConfigurationModeFilter {
bucketFilter = "(" + view.BucketConfiguration[id].Filter + ")"
}

4
pkg/models/task_collection.go
View File

@ -142,7 +142,7 @@ func getTaskOrTasksInBuckets(s *xorm.Session, a web.Auth, projects []*Project, v
return getTasksForProjects(s, projects, a, opts, view)
}
if view != nil && !strings.Contains(opts.filter, "bucket_id") {
if view != nil && !strings.Contains(opts.filter, taskPropertyBucketID) {
if view.BucketConfigurationMode != BucketConfigurationModeNone {
tasksInBuckets, err := GetTasksInBucketsForView(s, view, projects, opts, a)
return tasksInBuckets, len(tasksInBuckets), int64(len(tasksInBuckets)), err
@ -285,7 +285,7 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
}
}
if strings.Contains(tf.Filter, "bucket_id") {
if strings.Contains(tf.Filter, taskPropertyBucketID) {
filteringForBucket = true
if view.BucketConfigurationMode == BucketConfigurationModeFilter {
tf.Filter, err = getFilterValueForBucketFilter(tf.Filter, view)

2
pkg/models/task_search.go
View File

@ -460,7 +460,7 @@ func convertParsedFilterToTypesense(rawFilters []*taskFilter) (filterBy string,
f.field = "project_id"
}
if f.field == "bucket_id" {
if f.field == taskPropertyBucketID {
f.field = "buckets"
}