Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix: fuzzy query on dashboard milestone page.
  • Loading branch information
rogerluo410 committed Mar 3, 2021
commit afd759651cb6dcc8c0c16940568cf76f6ee98e31
6 changes: 3 additions & 3 deletions models/issue_milestone.go
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ func GetMilestonesStatsByRepoCondAndKw(repoCond builder.Cond, keyword string) (*

sess := x.Where("is_closed = ?", false)
if len(keyword) > 0 {
sess = sess.Where(builder.Like{"name", keyword})
sess = sess.And(builder.Like{"name", keyword})
}
if repoCond.IsValid() {
sess.And(builder.In("repo_id", builder.Select("id").From("repository").Where(repoCond)))
Expand All @@ -527,7 +527,7 @@ func GetMilestonesStatsByRepoCondAndKw(repoCond builder.Cond, keyword string) (*

sess = x.Where("is_closed = ?", true)
if len(keyword) > 0 {
sess = sess.Where(builder.Like{"name", keyword})
sess = sess.And(builder.Like{"name", keyword})
}
if repoCond.IsValid() {
sess.And(builder.In("repo_id", builder.Select("id").From("repository").Where(repoCond)))
Expand Down Expand Up @@ -586,7 +586,7 @@ func CountMilestonesByRepoCond(repoCond builder.Cond, isClosed bool) (map[int64]
func CountMilestonesByRepoCondAndKw(repoCond builder.Cond, keyword string, isClosed bool) (map[int64]int64, error) {
sess := x.Where("is_closed = ?", isClosed)
if len(keyword) > 0 {
sess = sess.Where("name = ?", keyword)
sess = sess.And(builder.Like{"name", keyword})
}
if repoCond.IsValid() {
sess.In("repo_id", builder.Select("id").From("repository").Where(repoCond))
Expand Down