local
/
todo-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tag filtering

master
bel 2020-01-20 16:06:33 -07:00
parent 097ca9b8c0
commit b47327dfe6
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/ajax/task.go
View File

@ -27,17 +27,19 @@ func (a *Ajax) loadTasks(w http.ResponseWriter, r *http.Request) error {
if len(whitelistTags) == 0 { if len(whitelistTags) == 0 {
return true return true
} }
whitelistTagMap := make(map[string]struct{}) for _, whitelisted := range whitelistTags {
for _, tag := range whitelistTags { found := false
whitelistTagMap[tag] = struct{}{}
}
for _, tag := range t.Tags { for _, tag := range t.Tags {
if _, ok := whitelistTagMap[tag]; ok { if whitelisted == tag {
return true found = true
} }
} }
if !found {
return false return false
} }
}
return true
}
filterSubstr := func(t *task.Task) bool { filterSubstr := func(t *task.Task) bool {
substr := form.Get(r, "s") substr := form.Get(r, "s")
return substr == "" || strings.Contains(fmt.Sprintf("%+v", t), substr) return substr == "" || strings.Contains(fmt.Sprintf("%+v", t), substr)